From e2562b9c022aa5296ba2eb88d4e297a8c74d85bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 21 Oct 2016 17:05:41 +0200
Subject: [PATCH] Changed envsetup conf import in bash scripts (refs #19005).
---
101.Apply_client_configuration/0_setup.sh | 2 +-
102.Run_tests/0_setup.sh | 2 +-
103.Configure_client_smtp/0_setup.sh | 2 +-
104.Apply_default_configuration/0_setup.sh | 2 +-
105.Insert_wowza_license/0_setup.sh | 2 +-
21.Initialize_environment/0_setup.sh | 2 +-
22.Initialize_configuration_file/0_setup.sh | 2 +-
23.Deploy_ssl_certificate/0_setup.sh | 2 +-
31.Install_munin/0_setup.sh | 2 +-
41.Install_MS/0_setup.sh | 2 +-
42.nginx_tweaks/0_setup.sh | 2 +-
51.Install_CM/0_setup.sh | 2 +-
71.Install_a_cache/0_setup.sh | 2 +-
72.Deploy_munin_configuration/0_setup.sh | 2 +-
73.Install_ferm/0_setup.sh | 2 +-
81.Install_MV/0_setup.sh | 2 +-
conf.sh | 4 +++-
tests/test_apt.sh | 2 +-
tests/test_ntp.sh | 2 +-
19 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/101.Apply_client_configuration/0_setup.sh b/101.Apply_client_configuration/0_setup.sh
index b74ba7a5..ad3c41e3 100755
--- a/101.Apply_client_configuration/0_setup.sh
+++ b/101.Apply_client_configuration/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
echo -e "
${RED}Customer parameters will be applied after rebooting. Note that you won't be able to login to the machine after this operation !${NC}"
diff --git a/102.Run_tests/0_setup.sh b/102.Run_tests/0_setup.sh
index d680c986..9291b8aa 100755
--- a/102.Run_tests/0_setup.sh
+++ b/102.Run_tests/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# generate post-deployment conf file
echo "SOURCES.LIST" > /root/deployment.results
diff --git a/103.Configure_client_smtp/0_setup.sh b/103.Configure_client_smtp/0_setup.sh
index 30057a2b..41247330 100755
--- a/103.Configure_client_smtp/0_setup.sh
+++ b/103.Configure_client_smtp/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# set SMTP
if ( ! test -z ${EMAIL_SMTP_SERVER} )
diff --git a/104.Apply_default_configuration/0_setup.sh b/104.Apply_default_configuration/0_setup.sh
index 8888458b..e3527b7a 100755
--- a/104.Apply_default_configuration/0_setup.sh
+++ b/104.Apply_default_configuration/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# apply MS default network parameters
sudo sed -i "s@address .*@address 192.168.1.10@" /etc/network/interfaces
diff --git a/105.Insert_wowza_license/0_setup.sh b/105.Insert_wowza_license/0_setup.sh
index c3dfd93b..8487c869 100755
--- a/105.Insert_wowza_license/0_setup.sh
+++ b/105.Insert_wowza_license/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
echo "Insert wowza license key :"
read WOWZA_LICENSE2
diff --git a/21.Initialize_environment/0_setup.sh b/21.Initialize_environment/0_setup.sh
index 73ae54fc..eef64661 100755
--- a/21.Initialize_environment/0_setup.sh
+++ b/21.Initialize_environment/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# hostname
echo "127.0.0.1 ${ETC_HOSTNAME}" >> /etc/hosts
diff --git a/22.Initialize_configuration_file/0_setup.sh b/22.Initialize_configuration_file/0_setup.sh
index 85036900..39758b27 100755
--- a/22.Initialize_configuration_file/0_setup.sh
+++ b/22.Initialize_configuration_file/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# Conf setup
sed -i "s@^NTP_SERVER1 = .*@NTP_SERVER1 = '${NTP}'@" /root/envsetup/conf.py
diff --git a/23.Deploy_ssl_certificate/0_setup.sh b/23.Deploy_ssl_certificate/0_setup.sh
index 74a0ca31..de2b4d96 100755
--- a/23.Deploy_ssl_certificate/0_setup.sh
+++ b/23.Deploy_ssl_certificate/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# deploy ssl certificate
if ( test ${SSL_CERTIFICATE} )
diff --git a/31.Install_munin/0_setup.sh b/31.Install_munin/0_setup.sh
index 945d6317..50dd6f12 100755
--- a/31.Install_munin/0_setup.sh
+++ b/31.Install_munin/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# This script should be run after Nginx and Wowza setup (if they should be installed)
diff --git a/41.Install_MS/0_setup.sh b/41.Install_MS/0_setup.sh
index 099a5c31..7e1c03c2 100755
--- a/41.Install_MS/0_setup.sh
+++ b/41.Install_MS/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# installation mediaserver
DEBIAN_FRONTEND=noninteractive apt-get install -y python3-mediaserver
diff --git a/42.nginx_tweaks/0_setup.sh b/42.nginx_tweaks/0_setup.sh
index 2dccc9e6..f063df6c 100755
--- a/42.nginx_tweaks/0_setup.sh
+++ b/42.nginx_tweaks/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# optimisations nginx
if ( test -f /etc/nginx/nginx.conf )
diff --git a/51.Install_CM/0_setup.sh b/51.Install_CM/0_setup.sh
index a6f5f030..73ffc259 100755
--- a/51.Install_CM/0_setup.sh
+++ b/51.Install_CM/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
#APT_CACHER_PWD=$(cat ${CONF} | egrep ^APT_CACHER_PWD | head -1 | awk -F "=" '{print$2}')
APT_CACHER_PWD=$(pwgen 12)
diff --git a/71.Install_a_cache/0_setup.sh b/71.Install_a_cache/0_setup.sh
index deeed670..ac90ec7e 100755
--- a/71.Install_a_cache/0_setup.sh
+++ b/71.Install_a_cache/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
sed -i "s@\[CLIENT\]@$(hostname)@" default
sed -i "s@\[CACHE_DIR\]@${CACHE_DIR}@" default
diff --git a/72.Deploy_munin_configuration/0_setup.sh b/72.Deploy_munin_configuration/0_setup.sh
index d5030834..285fc051 100755
--- a/72.Deploy_munin_configuration/0_setup.sh
+++ b/72.Deploy_munin_configuration/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
# for munin
DEBIAN_FRONTEND=noninteractive apt-get install -y ubicast-config
diff --git a/73.Install_ferm/0_setup.sh b/73.Install_ferm/0_setup.sh
index 3786d80f..1cc236dc 100755
--- a/73.Install_ferm/0_setup.sh
+++ b/73.Install_ferm/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
DEBIAN_FRONTEND=noninteractive aptitude install -y ferm
cp ferm.conf /etc/ferm/ferm.conf
diff --git a/81.Install_MV/0_setup.sh b/81.Install_MV/0_setup.sh
index ebe568f8..1ab9da8b 100755
--- a/81.Install_MV/0_setup.sh
+++ b/81.Install_MV/0_setup.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
aptitude install -y dialog
cd /root
diff --git a/conf.sh b/conf.sh
index 1c77a455..08150157 100644
--- a/conf.sh
+++ b/conf.sh
@@ -1,5 +1,7 @@
#!/bin/bash
# Envsetup local configuration file
# See default configuration in default-conf.sh
-#
+
+source default-conf.sh
+
# Put your configuration here
diff --git a/tests/test_apt.sh b/tests/test_apt.sh
index 3c185764..74a15877 100755
--- a/tests/test_apt.sh
+++ b/tests/test_apt.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
echo "Testing apt-get upgrade"
diff --git a/tests/test_ntp.sh b/tests/test_ntp.sh
index 6b56c61e..1a68cacb 100755
--- a/tests/test_ntp.sh
+++ b/tests/test_ntp.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-source /root/envsetup/envsetup.conf
+source /root/envsetup/conf.sh
set -e
--
GitLab