From b3d3c1f43b12efe8bf6353a6a7e7f9fca8ca4523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 4 Nov 2016 13:08:38 +0100
Subject: [PATCH] Renamed a proxy var name (refs #19005).
---
101.Apply_client_configuration/0_setup.sh | 10 +++++-----
51.Install_CM/0_setup.sh | 2 +-
default-conf.sh | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/101.Apply_client_configuration/0_setup.sh b/101.Apply_client_configuration/0_setup.sh
index ad3c41e3..7b8c2eb1 100755
--- a/101.Apply_client_configuration/0_setup.sh
+++ b/101.Apply_client_configuration/0_setup.sh
@@ -44,11 +44,11 @@ then
if [ ${PROXY_AUTHENTICATION} = "1" ]
then
# APT
- echo "Acquire::http::Proxy \"http://${PROXY_USER}:${PROXY_PASSWD}@${PROXY_HTTP}:${PROXY_PORT}\";" > /etc/apt/apt.conf.d/proxy
- echo "Acquire::https::Proxy \"http://${PROXY_USER}:${PROXY_PASSWD}@${PROXY_HTTP}:${PROXY_PORT}\";" >> /etc/apt/apt.conf.d/proxy
+ echo "Acquire::http::Proxy \"http://${PROXY_USER}:${PROXY_PWD}@${PROXY_HTTP}:${PROXY_PORT}\";" > /etc/apt/apt.conf.d/proxy
+ echo "Acquire::https::Proxy \"http://${PROXY_USER}:${PROXY_PWD}@${PROXY_HTTP}:${PROXY_PORT}\";" >> /etc/apt/apt.conf.d/proxy
# /etc/environment
- echo "http_proxy=\"http://${PROXY_USER}:${PROXY_PASSWD}@${PROXY_HTTP}:${PROXY_PORT}\"" >> /etc/environment
- echo "https_proxy=\"http://${PROXY_USER}:${PROXY_PASSWD}@${PROXY_HTTP}:${PROXY_PORT}\"" >> /etc/environment
+ echo "http_proxy=\"http://${PROXY_USER}:${PROXY_PWD}@${PROXY_HTTP}:${PROXY_PORT}\"" >> /etc/environment
+ echo "https_proxy=\"http://${PROXY_USER}:${PROXY_PWD}@${PROXY_HTTP}:${PROXY_PORT}\"" >> /etc/environment
else
# APT
echo "Acquire::http::Proxy \"http://${PROXY_HTTP}:${PROXY_PORT}\";" > /etc/apt/apt.conf.d/proxy
@@ -87,7 +87,7 @@ NB_MAX=$(wc -l /usr/local/WowzaStreamingEngine/conf/Server.xml | awk '{print$1}'
echo "</Property>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
echo "<Property>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
echo "<Name>licenseServerProxyPassword</Name>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
- echo "<Value>${PROXY_PASSWD}</Value>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
+ echo "<Value>${PROXY_PWD}</Value>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
echo "</Property>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
echo "</Properties>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
echo "</Server>" >> /usr/local/WowzaStreamingEngine/conf/Server.xml
diff --git a/51.Install_CM/0_setup.sh b/51.Install_CM/0_setup.sh
index f9679a48..d5023c03 100755
--- a/51.Install_CM/0_setup.sh
+++ b/51.Install_CM/0_setup.sh
@@ -20,7 +20,7 @@ fi
if [ ${PROXY} = "1" ]; then
if [ ${PROXY_AUTHENTICATION} = "1" ]; then
# general settings
- echo "Proxy: http://${PROXY_USER}:${PROXY_PASSWD}@${PROXY_HTTP}:${PROXY_PORT}" >> /etc/apt-cacher-ng/acng.conf
+ echo "Proxy: http://${PROXY_USER}:${PROXY_PWD}@${PROXY_HTTP}:${PROXY_PORT}" >> /etc/apt-cacher-ng/acng.conf
else
# general settings
echo "Proxy: http://${PROXY_HTTP}:${PROXY_PORT}" >> /etc/apt-cacher-ng/acng.conf
diff --git a/default-conf.sh b/default-conf.sh
index a247a6e6..c6b37f90 100644
--- a/default-conf.sh
+++ b/default-conf.sh
@@ -19,14 +19,6 @@ NTP_SERVER2=
NTP_SERVER3=
# hosts
ETC_HOSTNAME='mediaserver'
-# proxy
-PROXY=0
-PROXY_AUTHENTICATION=0
-PROXY_HTTP=
-PROXY_HTTPS=
-PROXY_PORT=
-PROXY_USER=
-PROXY_PASSWD=
# SSL certificate
SSL_CERTIFICATE='/etc/ssl/certs/ssl-cert-snakeoil.pem'
SSL_CERTIFICATE_KEY='/etc/ssl/private/ssl-cert-snakeoil.key'
@@ -85,6 +77,14 @@ NETWORK_DNS1=0
NETWORK_DNS2=0
NETWORK_MASK=0
NETWORK_GATEWAY=0
+# proxy
+PROXY=0
+PROXY_AUTHENTICATION=0
+PROXY_HTTP=
+PROXY_HTTPS=
+PROXY_PORT=
+PROXY_USER=
+PROXY_PWD=
# -- Cache server specific --
# cache directory, prefer a ramfs - /tmp
--
GitLab