diff --git a/1.Utilities/0_setup.py b/1.Utilities/0_setup.py index f86ce4a95bbf156e76d14dacac04e4961b262c5e..837ef816bf9bd6bd1f1cf4eeb3f845311783a227 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 9f44a41c4714529e24e2eef932c82058461c3b77..53c62314eeddcc63389c5d54f61f92d1bf6c6a46 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