Begin changes to centralize conf (refs #19005).

101.Apply_client_configuration/0_setup.sh

@@ -5,9 +5,9 @@ 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}"	
 
 # set customer IP (/etc/network/interfaces)
-sed -i "s@192\.168\.40\.10.*@${CUST_IP}@" /etc/network/interfaces
-sed -i "s@255\.255\.252\..*@${CUST_NETMASK}@" /etc/network/interfaces
-sed -i "s@192\.168\.40\..*@${CUST_GATEWAY}@" /etc/network/interfaces
+sed -i "s@192\.168\.40\.10.*@${NETWORK_IP}@" /etc/network/interfaces
+sed -i "s@255\.255\.252\..*@${NETWORK_MASK}@" /etc/network/interfaces
+sed -i "s@192\.168\.40\..*@${NETWORK_GATEWAY}@" /etc/network/interfaces
 
 # backup-server specific
 if ( test -f /usr/sbin/burp )
@@ -19,22 +19,22 @@ newaliases
 fi
 
 # set customer DNS
-echo "nameserver ${CUST_NS1}" > /etc/resolv.conf
-echo "nameserver ${CUST_NS2}" >> /etc/resolv.conf
+echo "nameserver ${NETWORK_DNS1}" > /etc/resolv.conf
+echo "nameserver ${NETWORK_DNS2}" >> /etc/resolv.conf
 
 # set customer NTP
 sed -i "s@^server .*@@" /etc/ntp.conf
 echo "" >> /etc/ntp.conf
-echo "server ${CUST_NTP1}" >> /etc/ntp.conf
+echo "server ${NTP_SERVER1}" >> /etc/ntp.conf
 
-if ( ! test -z ${CUST_NTP2} )
+if ( ! test -z ${NTP_SERVER2} )
 then
-echo "server ${CUST_NTP2}" >> /etc/ntp.conf
+echo "server ${NTP_SERVER2}" >> /etc/ntp.conf
 fi
 
-if ( ! test -z ${CUST_NTP3} )
+if ( ! test -z ${NTP_SERVER3} )
 then
-echo "server ${CUST_NTP3}" >> /etc/ntp.conf
+echo "server ${NTP_SERVER3}" >> /etc/ntp.conf
 fi
 service ntp restart
 
@@ -119,20 +119,13 @@ echo "#DEFAULT_FROM_EMAIL = '${DEFAULT_FROM_EMAIL}'" >> /home/skyreach/htdocs/sk
 fi
 
 # set locale
-if [ ${CUST_LOCALE} != 'FR' ]
-then
 echo -e "${CYAN}You will now change the locales.${NC}"
-locale-gen en_GB
 locale-gen en_GB.UTF-8
 dpkg-reconfigure locales
-#~dpkg-reconfigure console-data
-dpkg-reconfigure keyboard-configuration
 update-locale LANG=en_GB.UTF-8 LANGUAGE=en_GB.UTF-8 LC_ALL=en_GB.UTF-8 LC_MESSAGES=en_GB.UTF-8
-fi
+#dpkg-reconfigure console-data
+#dpkg-reconfigure keyboard-configuration
 
 # set TZ
-if [ ${CUST_TZ} != 'FR' ]
-then
 echo -e "${CYAN}You will now change the time zone.${NC}"
 dpkg-reconfigure tzdata
-fi

102.Run_tests/0_setup.sh

@@ -6,7 +6,7 @@ echo "SOURCES.LIST" > /root/deployment.results
 cat /etc/apt/sources.list | grep ^deb >> /root/deployment.results
 echo "" >> /root/deployment.results
 
-echo "SOURCES.LIST - PANEL" >> /root/deployment.results
+echo "SOURCES.LIST - SKYREACH_HOST" >> /root/deployment.results
 cat /etc/apt/sources.list.d/skyreach.list >> /root/deployment.results
 echo "" >> /root/deployment.results
 

103.Configure_client_smtp/0_setup.sh

@@ -2,7 +2,7 @@
 source /root/envsetup/envsetup.conf
 
 # set SMTP
-if ( ! test -z ${CUST_SMTP} )
+if ( ! test -z ${SMTP_SERVER} )
 then
-sed -i "s@relayhost = .*@relayhost = ${CUST_SMTP}@" /etc/postfix/main.cf
+sed -i "s@relayhost = .*@relayhost = ${SMTP_SERVER}@" /etc/postfix/main.cf
 fi

2.System/0_setup.py

@@ -13,7 +13,7 @@ def setup(interactive=True):
         # NTP
         'echo "Replacing /etc/ntp.conf"',
         dict(line='write', template='%s/ntp.conf' % dir_path, target='/etc/ntp.conf', params=(
-            ('{{ system_ntp }}', utils.get_conf('system_ntp', 'ntp.ubuntu.com')),
+            ('{{ NTP_SERVER1 }}', utils.get_conf('NTP_SERVER1', 'ntp.ubuntu.com')),
         )),
     ]
     # Create / update ubicast account

2.System/ntp.conf

@@ -22,7 +22,7 @@ server 2.ubuntu.pool.ntp.org
 server 3.ubuntu.pool.ntp.org
 
 # Use Ubuntu's ntp server as a fallback.
-server {{ system_ntp }}
+server {{ NTP_SERVER1 }}
 
 # Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
 # details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>

21.Initialize_environment/0_setup.sh

@@ -14,11 +14,11 @@ nameserver 192.168.40.6
 EOF
 
 # set ubicast account pwd
-echo -e "${UBICAST_PASSWD}\n${UBICAST_PASSWD}" | (passwd -q ubicast)
+echo -e "${SHELL_UBICAST_PWD}\n${SHELL_UBICAST_PWD}" | (passwd -q ubicast)
 
 # create admin account
 useradd -m admin --shell /bin/bash 
-echo -e "${SHELL_PWD}\n${SHELL_PWD}" | (passwd -q admin)
+echo -e "${SHELL_ADMIN_PWD}\n${SHELL_ADMIN_PWD}" | (passwd -q admin)
 usermod -aG sudo admin
 
 # migrate to Ubuntu 16.04 / apply sources.list
@@ -38,15 +38,15 @@ apt-get update && apt-get install -y aptitude && aptitude upgrade -y
 aptitude install -y apt-transport-https pwgen ntpdate
 
 # modify sources.list to use ubicast cache
-grep ${CACHE} /etc/apt/sources.list
+grep ${APT_CACHE_HOST} /etc/apt/sources.list
 if [ $? = 1 ]
 then
-sed -i "s@http://@http://${CACHE}/@" /etc/apt/sources.list
+sed -i "s@http://@http://${APT_CACHE_HOST}/@" /etc/apt/sources.list
 fi
 
 # APT panel
-wget -q https://${PANEL}/media/public.gpg -O- | sudo apt-key add -
-echo "deb https://${PANEL} packaging/apt/${API}/" > /etc/apt/sources.list.d/skyreach.list
+wget -q https://${SKYREACH_HOST}/media/public.gpg -O- | sudo apt-key add -
+echo "deb https://${SKYREACH_HOST} packaging/apt/${SKYREACH_API_KEY}/" > /etc/apt/sources.list.d/skyreach.list
 aptitude update
 
 # unattended-upgrades

22.Initialize_configuration_file/0_setup.sh

@@ -2,44 +2,42 @@
 source /root/envsetup/envsetup.conf
 
 # Conf setup
-sed -i "s@^system_ntp = .*@system_ntp = '${NTP}'@" /root/envsetup/conf.py
-sed -i "s@^system_smtp = .*@system_smtp = '${CUST_SMTP}'@" /root/envsetup/conf.py
-sed -i "s@^mysql_root_pwd = .*@mysql_root_pwd = '${MYSQLD_PWD}'@" /root/envsetup/conf.py
+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@^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
-sed -i "s@^wowza_manager_pwd = .*@wowza_manager_pwd = '${WOWZA_MANAGER_PWD}'@" /root/envsetup/conf.py
-sed -i "s@^wowza_license = .*@wowza_license = '${WOWZA_LICENSE}'@" /root/envsetup/conf.py
-sed -i "s@^wowza_live_pwd = .*@wowza_live_pwd = '${WOWZA_LIVE_PASSWD}'@" /root/envsetup/conf.py
+sed -i "s@^WOWZA_MANAGER_PWD = .*@WOWZA_MANAGER_PWD = '${WOWZA_MANAGER_PWD}'@" /root/envsetup/conf.py
+sed -i "s@^WOWZA_LICENSE = .*@WOWZA_LICENSE = '${WOWZA_LICENSE}'@" /root/envsetup/conf.py
+sed -i "s@^WOWZA_LIVE_PWD = .*@WOWZA_LIVE_PWD = '${WOWZA_LIVE_PWD}'@" /root/envsetup/conf.py
 # MS
-sed -i "s@^ms_server_name = .*@ms_server_name = '${MS}'@" /root/envsetup/conf.py
-sed -i "s@^ms_superuser_pwd = .*@ms_superuser_pwd = '${SUPERUSER_PWD}'@" /root/envsetup/conf.py
-sed -i "s@^ms_admin_pwd = .*@ms_admin_pwd = '${ADMIN_PWD}'@" /root/envsetup/conf.py
+sed -i "s@^MS_SERVER_NAME = .*@MS_SERVER_NAME = '${MS_SERVER_NAME}'@" /root/envsetup/conf.py
+sed -i "s@^MS_SUPERUSER_PWD = .*@MS_SUPERUSER_PWD = '${SUPERUSER_PWD}'@" /root/envsetup/conf.py
+sed -i "s@^MS_ADMIN_PWD = .*@MS_ADMIN_PWD = '${ADMIN_PWD}'@" /root/envsetup/conf.py
 if [ "${MS_ID}" = "" ]; then
 	MS_ID=$(echo "$(hostname)_msuser")
 fi
-if [ "${MS_API}" = "" ]; then
-	MS_API=$(echo "s$(pwgen 4)-$(pwgen 5)-$(pwgen 5)-$(pwgen 5)-$(pwgen 5)")
+if [ "${MS_API_KEY}" = "" ]; then
+	MS_API_KEY=$(echo "s$(pwgen 4)-$(pwgen 5)-$(pwgen 5)-$(pwgen 5)-$(pwgen 5)")
 	# respect API pattern
-	MS_API=$(echo $MS_API | sed "s@[iloILO]@$((${RANDOM} / 10000))@g")
+	MS_API_KEY=$(echo $MS_API_KEY | sed "s@[iloILO]@$((${RANDOM} / 10000))@g")
 fi
 if [ "${MS_SECRET}" = "" ]; then
 	MS_SECRET=$(echo "$(pwgen 40)")
 fi
-sed -i "s@^ms_id = .*@ms_id = '${MS_ID}'@" /root/envsetup/conf.py
-sed -i "s@^ms_api_key = .*@ms_api_key = '${MS_API}'@" /root/envsetup/conf.py
-sed -i "s@^ms_secret = .*@ms_secret = '${MS_SECRET}'@" /root/envsetup/conf.py
+sed -i "s@^MS_ID = .*@MS_ID = '${MS_ID}'@" /root/envsetup/conf.py
+sed -i "s@^MS_API_KEY = .*@MS_API_KEY = '${MS_API_KEY}'@" /root/envsetup/conf.py
+sed -i "s@^MS_SECRET = .*@MS_SECRET = '${MS_SECRET}'@" /root/envsetup/conf.py
 # SK
-sed -i "s@^skyreach_server_name = .*@skyreach_server_name = '${CM}'@" /root/envsetup/conf.py
-sed -i "s@^skyreach_superuser_pwd = .*@skyreach_superuser_pwd = '${CM_SUPERUSER_PWD}'@" /root/envsetup/conf.py
-sed -i "s@^skyreach_admin_pwd = .*@skyreach_admin_pwd = '${CM_ADMIN_PWD}'@" /root/envsetup/conf.py
+sed -i "s@^CM_SERVER_NAME = .*@CM_SERVER_NAME = '${CM}'@" /root/envsetup/conf.py
+sed -i "s@^CM_SUPERUSER_PWD = .*@CM_SUPERUSER_PWD = '${CM_SUPERUSER_PWD}'@" /root/envsetup/conf.py
+sed -i "s@^CM_ADMIN_PWD = .*@CM_ADMIN_PWD = '${CM_ADMIN_PWD}'@" /root/envsetup/conf.py
 # Monitor
-sed -i "s@^monitor_server_name = .*@monitor_server_name = '${MONITOR}'@" /root/envsetup/conf.py
-sed -i "s@^monitor_superuser_pwd = .*@monitor_superuser_pwd = '${MONITOR_SUPERUSER_PWD}'@" /root/envsetup/conf.py
-sed -i "s@^monitor_admin_pwd = .*@monitor_admin_pwd = '${MONITOR_ADMIN_PWD}'@" /root/envsetup/conf.py
+sed -i "s@^MONITOR_SERVER_NAME = .*@MONITOR_SERVER_NAME = '${MONITOR}'@" /root/envsetup/conf.py
+sed -i "s@^MONITOR_SUPERUSER_PWD = .*@MONITOR_SUPERUSER_PWD = '${MONITOR_SUPERUSER_PWD}'@" /root/envsetup/conf.py
+sed -i "s@^MONITOR_ADMIN_PWD = .*@MONITOR_ADMIN_PWD = '${MONITOR_ADMIN_PWD}'@" /root/envsetup/conf.py
 # Worker
-sed -i "s@^celerity_signing_key = .*@celerity_signing_key = '${CELERIY_SIGNING_KEY}'@" /root/envsetup/conf.py
+sed -i "s@^CELERITY_SIGNING_KEY = .*@CELERITY_SIGNING_KEY = '${CELERITY_SIGNING_KEY}'@" /root/envsetup/conf.py
 # IP for whitelist
-if [ "${IS_WORKER}" = "1" ]; then
-	WORKER_IP=$(ip addr show | grep inet | grep -v 127 | grep -v ":" | awk -F " " '{print$2}' | awk -F "/" '{print$1}')
-fi
-sed -i "s@^celerity_worker_ip = .*@celerity_worker_ip = '${WORKER_IP}'@" /root/envsetup/conf.py
+CELERITY_WORKER_IP=$(ip addr show | grep inet | grep -v 127 | grep -v ":" | awk -F " " '{print$2}' | awk -F "/" '{print$1}')
+sed -i "s@^CELERITY_CELERITY_WORKER_IP = .*@CELERITY_CELERITY_WORKER_IP = '${CELERITY_WORKER_IP}'@" /root/envsetup/conf.py

3.MySQL/0_setup.py

@@ -13,11 +13,11 @@ def setup(interactive=True):
         'cp "%s/override.conf" "/etc/systemd/system/mysql.service.d/override.conf"' % dir_path,
         '/etc/init.d/mysql restart',
     ]
-    mysql_root_pwd = utils.get_conf('mysql_root_pwd')
-    if mysql_root_pwd:
+    MYSQL_ROOT_PWD = utils.get_conf('MYSQL_ROOT_PWD')
+    if MYSQL_ROOT_PWD:
         # Set password if any
-        cmds.append('mysqladmin -u root password "%s"' % mysql_root_pwd)
+        cmds.append('mysqladmin -u root password "%s"' % MYSQL_ROOT_PWD)
     utils.run_commands(cmds)
 
-    if not mysql_root_pwd:
+    if not MYSQL_ROOT_PWD:
         utils.log('No root password was set in the configuration file.\nUse the following command to change it:\n    mysqladmin -u root password <pwd>')

31.Install_munin/0_setup.sh

@@ -18,7 +18,7 @@ contacts alert
 contact.alert.command mail -a "From:sysadmin <sysadmin@ubicast.eu>" -s "[munin] Alert on ${var:host}" sysadmin@ubicast.eu
 contact.alert.always_send warning critical
 
-[${MS}]
+[${MS_SERVER_NAME}]
     address 127.0.0.1
     use_node_name yes
     memory.free.warning 512000000:

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('system_smtp', '')),
+            ('{{ smtp }}', utils.get_conf('SMTP_SERVER', '')),
         )),
         'echo "%s" > /etc/mailname' % hostname,
         'rgrep root /etc/aliases || echo "root: sysadmin@ubicast.eu" >> /etc/aliases',

41.Install_MS/0_setup.sh

@@ -7,10 +7,5 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y python3-mediaserver
 # session ms
 msinstaller.py msuser
 
-# disabling integrated worker if needed
-if [ ${IS_WORKER} = "0" ]; then
-	apt-get remove -y celerity-workers
-fi
-
 # mv MS_deploy.sh to /var/tmp
 mv MS_deploy.sh /var/tmp/MS_deploy.sh

5.Wowza/0_setup.py

@@ -19,15 +19,15 @@ def setup(interactive=True):
         '[ -f "/tmp/%(name)s" ] || wget -q "https://www.ubicast.eu/media/downloads/packages/%(name)s" -O "/tmp/%(name)s"' % {'name': wowza_setup_name},
         'dpkg -i "/tmp/%s"' % wowza_setup_name,
         # Configure Wowza
-        'echo "%s" > /usr/local/WowzaStreamingEngine/conf/Server.license' % utils.get_conf('wowza_license'),
-        'echo "ubicast %s admin" > /usr/local/WowzaStreamingEngine/conf/admin.password' % utils.get_conf('wowza_manager_pwd'),
+        'echo "%s" > /usr/local/WowzaStreamingEngine/conf/Server.license' % utils.get_conf('WOWZA_LICENSE'),
+        'echo "ubicast %s admin" > /usr/local/WowzaStreamingEngine/conf/admin.password' % utils.get_conf('WOWZA_MANAGER_PWD'),
         'update-rc.d WowzaStreamingEngine defaults',
         'update-rc.d WowzaStreamingEngineManager defaults',
         'chmod +x /usr/local/WowzaStreamingEngine/logs',
         'cp -R /usr/local/WowzaStreamingEngine/examples/LiveVideoStreaming/conf/live /usr/local/WowzaStreamingEngine/conf/',
         'mkdir -p /usr/local/WowzaStreamingEngine/applications/live',
         dict(line='write', template='%s/live-application.xml' % dir_path, target='/usr/local/WowzaStreamingEngine/conf/live/Application.xml', backup=True, params=(
-            ('{{ live_pwd }}', utils.get_conf('wowza_live_pwd')),
+            ('{{ live_pwd }}', utils.get_conf('WOWZA_LIVE_PWD')),
         )),
         '/etc/init.d/WowzaStreamingEngine restart',
         '/etc/init.d/WowzaStreamingEngineManager restart',

51.Install_CM/0_setup.sh

 #!/bin/bash
 source /root/envsetup/envsetup.conf
 
-#APT_CACHE_PASSWD=$(cat ${CONF} | egrep ^APT_CACHE_PASSWD | head -1 | awk -F "=" '{print$2}')
-APT_CACHE_PASSWD=$(pwgen 12)
+#APT_CACHER_PWD=$(cat ${CONF} | egrep ^APT_CACHER_PWD | head -1 | awk -F "=" '{print$2}')
+APT_CACHER_PWD=$(pwgen 12)
 
 # installation cm
 aptitude install -y campus-manager
@@ -10,7 +10,7 @@ aptitude install -y campus-manager
 # installation cache local
 aptitude install -y apt-cacher-ng
 # secure it
-echo "AdminAuth: ${APT_CACHE_USER}:${APT_CACHE_PASSWD}" >> /etc/apt-cacher-ng/security.conf
+echo "AdminAuth: ${APT_CACHER_USER}:${APT_CACHER_PWD}" >> /etc/apt-cacher-ng/security.conf
 service apt-cacher-ng restart
 
 # proxy
@@ -29,7 +29,7 @@ fi
 # configure nginx
 python3 /root/envsetup/envsetup.py 7
 # devrait être inutile mais pb constaté avec jenkins
-sed -i "s@server_name skyreach;@server_name ${CM};@" /etc/nginx/sites-available/skyreach.conf
+sed -i "s@server_name skyreach;@server_name ${CM_SERVER_NAME};@" /etc/nginx/sites-available/skyreach.conf
 
 #~mv /etc/nginx/sites-enabled/skyreach.conf.tmp /etc/nginx/sites-enabled/skyreach.conf
 service nginx restart

6.HCA/0_setup.py

@@ -13,7 +13,7 @@ def setup(interactive=True):
     if ftpmsuploader and ftpstorage and ftpadmin:
         cmds.append('mkdir -p /etc/hca')
         cmds.append(dict(line='write', template='%s/http.ini' % dir_path, target='/etc/hca/http.ini', params=(
-            ('{{ ms_server_name }}', utils.get_conf('ms_server_name', 'mediaserver')),
+            ('{{ MS_SERVER_NAME }}', utils.get_conf('MS_SERVER_NAME', 'mediaserver')),
             ('{{ ftp_server_name }}', utils.get_conf('ftp_server_name', 'videos')),
             ('{{ ftp_storage_pwd }}', ftpstorage),
             ('{{ ftp_msuploader_pwd }}', ftpmsuploader),
@@ -22,11 +22,11 @@ def setup(interactive=True):
     else:
         print('Configuration of HCA http.ini file skipped (no FTP passwords in config).')
     # rtmp.ini
-    streaming_pwd = utils.get_conf('wowza_live_pwd')
+    streaming_pwd = utils.get_conf('WOWZA_LIVE_PWD')
     if streaming_pwd:
         cmds.append('mkdir -p /etc/hca')
         cmds.append(dict(line='write', template='%s/rtmp.ini' % dir_path, target='/etc/hca/rtmp.ini', params=(
-            ('{{ ms_server_name }}', utils.get_conf('ms_server_name', 'mediaserver')),
+            ('{{ MS_SERVER_NAME }}', utils.get_conf('MS_SERVER_NAME', 'mediaserver')),
             ('{{ streaming_pwd }}', streaming_pwd),
         )))
     else:

6.HCA/http.ini

@@ -9,7 +9,7 @@ user = "ftpstorage"
 password = "{{ ftp_storage_pwd }}"
 
 #[rtmp]
-#server = "rtmp://{{ ms_server_name }}/vod"
+#server = "rtmp://{{ MS_SERVER_NAME }}/vod"
 #pattern = "%(video_path)s"
 
 #[hls]

6.HCA/rtmp.ini

 port=1935
-server="{{ ms_server_name }}"
+server="{{ MS_SERVER_NAME }}"
 app="live/_definst_?doPublish={{ streaming_pwd }}"
 enable_hls="yes"
-hls_uri_template="https://{{ ms_server_name }}/streaming/%(stream_id)s/Playlist.m3u8"
+hls_uri_template="https://{{ MS_SERVER_NAME }}/streaming/%(stream_id)s/Playlist.m3u8"

61.Celerity server/0_setup.py

@@ -8,10 +8,10 @@ def setup(interactive=True):
     cmds = [
         'apt-get install --yes celerity-server',
         dict(line='write', template='%s/celerity-config.py' % dir_path, target='/etc/celerity/config.py', params=(
-            ('{{ signing_key }}', utils.get_conf('celerity_signing_key', 'undefined')),
-            ('{{ ms_server_name }}', utils.get_conf('ms_server_name', 'undefined')),
-            ('{{ ms_id }}', utils.get_conf('ms_id', 'ms_id')),
-            ('{{ ms_api_key }}', utils.get_conf('ms_api_key', 'ms_api_key')),
+            ('{{ signing_key }}', utils.get_conf('CELERITY_SIGNING_KEY', 'undefined')),
+            ('{{ MS_SERVER_NAME }}', utils.get_conf('MS_SERVER_NAME', 'undefined')),
+            ('{{ MS_ID }}', utils.get_conf('MS_ID', 'MS_ID')),
+            ('{{ MS_API_KEY }}', utils.get_conf('MS_API_KEY', 'MS_API_KEY')),
         )),
         'service celerity-server restart',
     ]

61.Celerity server/celerity-config.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 SIGNING_KEY = '{{ signing_key }}'
-SERVER_URL = 'https://{{ ms_server_name }}:6200'
+SERVER_URL = 'https://{{ MS_SERVER_NAME }}:6200'
 
 # MediaServer interactions
 MEDIASERVERS = {
-    '{{ ms_id }}': {'url': 'https://{{ ms_server_name }}', 'api_key': '{{ ms_api_key }}'},
+    '{{ MS_ID }}': {'url': 'https://{{ MS_SERVER_NAME }}', 'api_key': '{{ MS_API_KEY }}'},
 }

62.Celerity workers/0_setup.py

@@ -8,10 +8,10 @@ def setup(interactive=True):
     cmds = [
         'apt-get install --yes celerity-workers',
         dict(line='write', template='%s/celerity-config.py' % dir_path, target='/etc/celerity/config.py', params=(
-            ('{{ signing_key }}', utils.get_conf('celerity_signing_key', 'undefined')),
-            ('{{ ms_server_name }}', utils.get_conf('ms_server_name', 'undefined')),
-            ('{{ ms_id }}', utils.get_conf('ms_id', 'ms_id')),
-            ('{{ ms_api_key }}', utils.get_conf('ms_api_key', 'ms_api_key')),
+            ('{{ signing_key }}', utils.get_conf('CELERITY_SIGNING_KEY', 'undefined')),
+            ('{{ MS_SERVER_NAME }}', utils.get_conf('MS_SERVER_NAME', 'undefined')),
+            ('{{ MS_ID }}', utils.get_conf('MS_ID', 'MS_ID')),
+            ('{{ MS_API_KEY }}', utils.get_conf('MS_API_KEY', 'MS_API_KEY')),
         )),
         'service celerity-workers restart',
     ]

62.Celerity workers/celerity-config.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 SIGNING_KEY = '{{ signing_key }}'
-SERVER_URL = 'https://{{ ms_server_name }}:6200'
+SERVER_URL = 'https://{{ MS_SERVER_NAME }}:6200'
 
 # MediaServer interactions
 MEDIASERVERS = {
-    '{{ ms_id }}': {'url': 'https://{{ ms_server_name }}', 'api_key': '{{ ms_api_key }}'},
+    '{{ MS_ID }}': {'url': 'https://{{ MS_SERVER_NAME }}', 'api_key': '{{ MS_API_KEY }}'},
 }