From aa6d1818cb9bf1c075f520d038acaed27a2b4044 Mon Sep 17 00:00:00 2001
From: Julien Allary <julien.allary@ubicast.eu>
Date: Mon, 19 Dec 2016 14:51:31 +0100
Subject: [PATCH] dialog added
---
1.Utilities/0_setup.py | 2 +-
41.Install_MS/MS_deploy.sh | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/1.Utilities/0_setup.py b/1.Utilities/0_setup.py
index f86ce4a9..837ef816 100644
--- a/1.Utilities/0_setup.py
+++ b/1.Utilities/0_setup.py
@@ -8,7 +8,7 @@ import utils
def setup(interactive=True):
cmds = [
'apt-get update',
- 'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors munin munin-node pciutils ntp nfs-client smartmontools pwgen ntpdate',
+ 'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors munin munin-node pciutils ntp nfs-client smartmontools pwgen ntpdate dialog',
'[ -f ~/.vimrc ] || echo "color ron" > ~/.vimrc',
]
utils.run_commands(cmds)
diff --git a/41.Install_MS/MS_deploy.sh b/41.Install_MS/MS_deploy.sh
index 9f44a41c..53c62314 100755
--- a/41.Install_MS/MS_deploy.sh
+++ b/41.Install_MS/MS_deploy.sh
@@ -13,8 +13,6 @@ MS_DNS10=$(grep nameserver /etc/resolv.conf | head -1 | awk '{print$2}')
MS_DNS20=$(grep nameserver /etc/resolv.conf | tail -1 | awk '{print$2}')
MS_NTP0=$(grep ^server /etc/ntp.conf | tail -1 | awk '{print$2}')
MS_VHOST0=$(grep server_name /etc/nginx/sites-available/mediaserver-msuser.conf | head -1 | awk '{print$2}' | awk -F ";" '{print$1}')
-MS_STREAMVHOST0=$(grep server_name /etc/nginx/sites-available/streaming.conf | head -1 | awk '{print$2}' | awk -F ";" '{print$1}')
-MS_VIDEOVHOST0=$(grep server_name /etc/nginx/sites-available/videos.conf | head -1 | awk '{print$2}' | awk -F ";" '{print$1}')
MS_CMVHOST0=$(grep server_name /etc/nginx/sites-available/skyreach.conf | head -1 | awk '{print$2}' | awk -F ";" '{print$1}')
MS_MONVHOST0=$(grep server_name /etc/nginx/sites-available/msmonitor.conf | head -1 | awk '{print$2}' | awk -F ";" '{print$1}')
@@ -70,10 +68,6 @@ sudo chown root:root /etc/ntp.conf
# webserver
# ms
sudo sed -i "s@server_name .*@server_name ${MS_VHOST};@" /etc/nginx/sites-available/mediaserver-msuser.conf
-# streaming
-sudo sed -i "s@server_name .*@server_name ${MS_STREAMVHOST};@" /etc/nginx/sites-available/streaming.conf
-# video
-sudo sed -i "s@server_name .*@server_name ${MS_VIDEOVHOST};@" /etc/nginx/sites-available/videos.conf
# cm
sudo sed -i "s@server_name .*@server_name ${MS_CMVHOST};@" /etc/nginx/sites-available/skyreach.conf
# monitor
--
GitLab