From d19865080b7b0a5b4cf7df8fa3bc80b0dd40bb54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 31 Mar 2017 15:01:25 +0200
Subject: [PATCH] Use Panel for git clone commands.
---
2.Common_services/5.Nginx/vhost_videos.conf | 11 -----------
2.Common_services/6.Munin/0_setup.sh | 2 +-
9.MediaVault/1.Install_MediaVault/0_setup.sh | 2 +-
tester.py | 2 +-
4 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/2.Common_services/5.Nginx/vhost_videos.conf b/2.Common_services/5.Nginx/vhost_videos.conf
index 2e95be2f..be9ffe3a 100644
--- a/2.Common_services/5.Nginx/vhost_videos.conf
+++ b/2.Common_services/5.Nginx/vhost_videos.conf
@@ -1,16 +1,5 @@
server {
listen 80;
- server_name {{ server_name }};
-
- root /var/www/videos/;
-
- access_log /var/log/nginx/access_videos.log;
- error_log /var/log/nginx/error_videos.log;
-
- add_header Access-Control-Allow-Origin "*";
-}
-
-server {
listen 443 ssl;
server_name {{ server_name }};
diff --git a/2.Common_services/6.Munin/0_setup.sh b/2.Common_services/6.Munin/0_setup.sh
index 82661243..dc55b4b7 100755
--- a/2.Common_services/6.Munin/0_setup.sh
+++ b/2.Common_services/6.Munin/0_setup.sh
@@ -29,7 +29,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y ubicast-config
# new skin templates
#cd /etc/munin
-#git clone https://git.ubicast.net/mediaserver/munin-monitoring-theme.git
+#git clone https://panel.ubicast.eu/git/mediaserver/munin-monitoring-theme.git
#mv /etc/munin/static /etc/munin/static.orig
#mv /etc/munin/templates /etc/munin/templates.orig
#cp -pr munin-monitoring-theme/templates/munstrap/static /etc/munin/
diff --git a/9.MediaVault/1.Install_MediaVault/0_setup.sh b/9.MediaVault/1.Install_MediaVault/0_setup.sh
index 41930434..43ad62f5 100755
--- a/9.MediaVault/1.Install_MediaVault/0_setup.sh
+++ b/9.MediaVault/1.Install_MediaVault/0_setup.sh
@@ -6,7 +6,7 @@ apt-get install -y dialog build-essential
cd /root
rm -rf burp-custom
-git clone https://git.ubicast.net/mediaserver/burp-custom.git burp-custom
+git clone https://panel.ubicast.eu/git/mediaserver/burp-custom.git burp-custom
# set conf
sed -i "s@^BURP_STATUS_IP=.*@BURP_STATUS_IP=${BURP_STATUS_IP}@" /root/burp-custom/burp-custom.sh
diff --git a/tester.py b/tester.py
index e03ce632..e9555874 100755
--- a/tester.py
+++ b/tester.py
@@ -190,7 +190,7 @@ class Tester():
os.chdir(self.root_dir)
else:
log('Cloning ms-testing-suite in "%s".' % ms_path)
- subprocess.check_call(['git', 'clone', 'https://git.ubicast.net/mediaserver/ms-testing-suite.git', ms_path])
+ subprocess.check_call(['git', 'clone', 'https://panel.ubicast.eu/git/mediaserver/ms-testing-suite.git', ms_path])
# Add tests to list
wowza_dir = '/usr/local/WowzaStreamingEngine'
etc_lives_conf = '/etc/mediaserver/lives_conf.py'
--
GitLab