From fe44e55821970e50b4b17860f823d5f4606892a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 21 Oct 2016 15:49:47 +0200
Subject: [PATCH] Renamed some vars (refs #19005).
---
101.Apply_client_configuration/0_setup.sh | 12 ++++++------
102.Run_tests/0_setup.sh | 2 +-
103.Configure_client_smtp/0_setup.sh | 4 ++--
22.Initialize_configuration_file/0_setup.sh | 2 +-
4.Postfix/0_setup.py | 2 +-
default-conf.sh | 9 +++------
6 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/101.Apply_client_configuration/0_setup.sh b/101.Apply_client_configuration/0_setup.sh
index a600318a..b74ba7a5 100755
--- a/101.Apply_client_configuration/0_setup.sh
+++ b/101.Apply_client_configuration/0_setup.sh
@@ -13,8 +13,8 @@ sed -i "s@192\.168\.40\..*@${NETWORK_GATEWAY}@" /etc/network/interfaces
if ( test -f /usr/sbin/burp )
then
# changer burp status IP
-sed -i "s@^CUST_BURP_MAIL_DEST=.*@CUST_BURP_MAIL_DEST=${CUST_BURP_MAIL_DEST}@" /root/burp-custom.sh
-sed -i "s@admin: .*@admin: ${CUST_BURP_MAIL_DEST}" /etc/aliases
+sed -i "s@^BURP_CLIENT_MAIL_DEST=.*@BURP_CLIENT_MAIL_DEST=${BURP_CLIENT_MAIL_DEST}@" /root/burp-custom.sh
+sed -i "s@admin: .*@admin: ${BURP_CLIENT_MAIL_DEST}" /etc/aliases
newaliases
fi
@@ -111,11 +111,11 @@ NB_MAX=$(wc -l /usr/local/WowzaStreamingEngine/conf/Server.xml | awk '{print$1}'
fi
fi
-# set DEFAULT_FROM_EMAIL
-if ( ! test -z ${DEFAULT_FROM_EMAIL} )
+# set email sender
+if ( ! test -z ${EMAIL_SENDER} )
then
-echo "#DEFAULT_FROM_EMAIL = '${DEFAULT_FROM_EMAIL}'" >> /etc/mediaserver/msconf.py
-echo "#DEFAULT_FROM_EMAIL = '${DEFAULT_FROM_EMAIL}'" >> /home/skyreach/htdocs/skyreach_site/settings_override.py
+echo "#DEFAULT_FROM_EMAIL = '${EMAIL_SENDER}'" >> /etc/mediaserver/msconf.py
+echo "#DEFAULT_FROM_EMAIL = '${EMAIL_SENDER}'" >> /home/skyreach/htdocs/skyreach_site/settings_override.py
fi
# set locale
diff --git a/102.Run_tests/0_setup.sh b/102.Run_tests/0_setup.sh
index 3ba1a03b..d680c986 100755
--- a/102.Run_tests/0_setup.sh
+++ b/102.Run_tests/0_setup.sh
@@ -45,5 +45,5 @@ echo "ssh $(service ssh status | grep Active)" >> /root/deployment.results
echo "uwsgi $(service uwsgi status | grep Active)" >> /root/deployment.results
echo "" >> /root/deployment.results
-cat /root/deployment.results | mail -aFrom:${DEFAULT_FROM_EMAIL} -s "$(hostname) deployed configuration" deployment@ubicast.eu
+cat /root/deployment.results | mail -aFrom:${EMAIL_SENDER} -s "$(hostname) deployed configuration" deployment@ubicast.eu
echo -e "${CYAN}A mail has been sent to deployment@ubicast.eu${NC}"
diff --git a/103.Configure_client_smtp/0_setup.sh b/103.Configure_client_smtp/0_setup.sh
index ca04db04..30057a2b 100755
--- a/103.Configure_client_smtp/0_setup.sh
+++ b/103.Configure_client_smtp/0_setup.sh
@@ -2,7 +2,7 @@
source /root/envsetup/envsetup.conf
# set SMTP
-if ( ! test -z ${SMTP_SERVER} )
+if ( ! test -z ${EMAIL_SMTP_SERVER} )
then
-sed -i "s@relayhost = .*@relayhost = ${SMTP_SERVER}@" /etc/postfix/main.cf
+sed -i "s@relayhost = .*@relayhost = ${EMAIL_SMTP_SERVER}@" /etc/postfix/main.cf
fi
diff --git a/22.Initialize_configuration_file/0_setup.sh b/22.Initialize_configuration_file/0_setup.sh
index 5c8c2148..85036900 100755
--- a/22.Initialize_configuration_file/0_setup.sh
+++ b/22.Initialize_configuration_file/0_setup.sh
@@ -3,7 +3,7 @@ source /root/envsetup/envsetup.conf
# Conf setup
sed -i "s@^NTP_SERVER1 = .*@NTP_SERVER1 = '${NTP}'@" /root/envsetup/conf.py
-sed -i "s@^SMTP_SERVER = .*@SMTP_SERVER = '${SMTP_SERVER}'@" /root/envsetup/conf.py
+sed -i "s@^EMAIL_SMTP_SERVER = .*@EMAIL_SMTP_SERVER = '${EMAIL_SMTP_SERVER}'@" /root/envsetup/conf.py
sed -i "s@^MYSQL_ROOT_PWD = .*@MYSQL_ROOT_PWD = '${MYSQL_ROOT_PWD}'@" /root/envsetup/conf.py
# Wowza
sed -i "s@^wowza_server_name = .*@wowza_server_name = '${WOWZA}'@" /root/envsetup/conf.py
diff --git a/4.Postfix/0_setup.py b/4.Postfix/0_setup.py
index 273438ad..e5f5cc57 100644
--- a/4.Postfix/0_setup.py
+++ b/4.Postfix/0_setup.py
@@ -19,7 +19,7 @@ def setup(interactive=True):
'echo "Replacing /etc/postfix/main.cf"',
dict(line='write', template='%s/main.cf' % dir_path, target='/etc/postfix/main.cf', params=(
('{{ hostname }}', hostname),
- ('{{ smtp }}', utils.get_conf('SMTP_SERVER', '')),
+ ('{{ smtp }}', utils.get_conf('EMAIL_SMTP_SERVER', '')),
)),
'echo "%s" > /etc/mailname' % hostname,
'rgrep root /etc/aliases || echo "root: sysadmin@ubicast.eu" >> /etc/aliases',
diff --git a/default-conf.sh b/default-conf.sh
index 728c9fbb..c9008440 100644
--- a/default-conf.sh
+++ b/default-conf.sh
@@ -40,12 +40,8 @@ SHELL_UBICAST_PWD='test'
SHELL_ADMIN_PWD='test'
# -- Emails --
-# SMTP
-SMTP_SERVER=
-# Django
-DEFAULT_FROM_EMAIL='support@ubicast.eu'
-# MediaVault
-CUST_BURP_MAIL_DEST='sysadmin@ubicast.eu'
+EMAIL_SMTP_SERVER=
+EMAIL_SENDER='support@ubicast.eu'
# -- Wowza --
WOWZA_LIVE_PWD='test'
@@ -115,6 +111,7 @@ BURP_SERVER='backupserver.ubicast.net'
BURP_MAIL_DEST='sysadmin@ubicast.eu'
# default mediaserver
BURP_CLIENT_NAME=
+BURP_CLIENT_MAIL_DEST='sysadmin@ubicast.eu'
# -- HA server specific --
HA_NODE1='ha-ms3'
--
GitLab