From d8d495599c348862eb364a7c0c172150c9fa11a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Wed, 1 Feb 2017 15:02:11 +0100
Subject: [PATCH] Moved MS deploy setup in a dedicated action.
---
.../1.Install_MediaServer/0_setup.sh | 7 ++-----
.../0_setup.py | 0
.../check_services.py | 0
5.MediaServer/3.Install_MS_deploy/0_setup.sh | 5 +++++
.../MS_deploy.sh | 0
launcher.sh | 21 +++++++++----------
6 files changed, 17 insertions(+), 16 deletions(-)
rename 5.MediaServer/{2.Startup check script for NFS => 2.Startup_check_script_for_NFS}/0_setup.py (100%)
rename 5.MediaServer/{2.Startup check script for NFS => 2.Startup_check_script_for_NFS}/check_services.py (100%)
create mode 100755 5.MediaServer/3.Install_MS_deploy/0_setup.sh
rename 5.MediaServer/{1.Install_MediaServer => 3.Install_MS_deploy}/MS_deploy.sh (100%)
diff --git a/5.MediaServer/1.Install_MediaServer/0_setup.sh b/5.MediaServer/1.Install_MediaServer/0_setup.sh
index c87fb5da..169cf8b0 100755
--- a/5.MediaServer/1.Install_MediaServer/0_setup.sh
+++ b/5.MediaServer/1.Install_MediaServer/0_setup.sh
@@ -1,11 +1,8 @@
#!/bin/bash
source /root/envsetup/conf.sh
-# installation mediaserver
+# Ms package install
DEBIAN_FRONTEND=noninteractive apt-get install -y python3-mediaserver
-# session ms
+# MS instance
msinstaller.py msuser
-
-# copy MS_deploy.sh to /var/tmp
-cp MS_deploy.sh /var/tmp/MS_deploy.sh
diff --git a/5.MediaServer/2.Startup check script for NFS/0_setup.py b/5.MediaServer/2.Startup_check_script_for_NFS/0_setup.py
similarity index 100%
rename from 5.MediaServer/2.Startup check script for NFS/0_setup.py
rename to 5.MediaServer/2.Startup_check_script_for_NFS/0_setup.py
diff --git a/5.MediaServer/2.Startup check script for NFS/check_services.py b/5.MediaServer/2.Startup_check_script_for_NFS/check_services.py
similarity index 100%
rename from 5.MediaServer/2.Startup check script for NFS/check_services.py
rename to 5.MediaServer/2.Startup_check_script_for_NFS/check_services.py
diff --git a/5.MediaServer/3.Install_MS_deploy/0_setup.sh b/5.MediaServer/3.Install_MS_deploy/0_setup.sh
new file mode 100755
index 00000000..b41af8a4
--- /dev/null
+++ b/5.MediaServer/3.Install_MS_deploy/0_setup.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+source /root/envsetup/conf.sh
+
+echo "Copying MS_deploy.sh"
+cp -v MS_deploy.sh /var/tmp/MS_deploy.sh
diff --git a/5.MediaServer/1.Install_MediaServer/MS_deploy.sh b/5.MediaServer/3.Install_MS_deploy/MS_deploy.sh
similarity index 100%
rename from 5.MediaServer/1.Install_MediaServer/MS_deploy.sh
rename to 5.MediaServer/3.Install_MS_deploy/MS_deploy.sh
diff --git a/launcher.sh b/launcher.sh
index f2583269..14491bb6 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -1,22 +1,20 @@
#!/bin/bash
-
set -e
-
-# This script installs a MS/worker/campus-manager/cache/MV through envsetup on a machine
+# This script installs a MS/worker/campus-manager/cache/MV using envsetup on a system
# Prerequisites
# 1. create DNS entries
-# alpha-auto.ubicast.net
-# cm-alpha-auto.ubicast.net
-# monitor-alpha-auto.ubicast.net
-# 2. create machine in panel
-# 3. envsetup-launcher.sh
+# alpha.ubicast.net
+# alpha-cm.ubicast.net
+# alpha-mon.ubicast.net
+# 2. create system in panel
+# 3. launcher.sh
# log
LOGFILE=/root/$(date +%F)_envsetup.log
exec > >(tee -i ${LOGFILE})
-## envsetup integration
+## envsetup action calls
init() {
python3 /root/envsetup/envsetup.py 11
python3 /root/envsetup/envsetup.py 12
@@ -45,6 +43,7 @@ mediaserver() {
python3 /root/envsetup/envsetup.py 25
python3 /root/envsetup/envsetup.py 51
python3 /root/envsetup/envsetup.py 52
+ python3 /root/envsetup/envsetup.py 53
python3 /root/envsetup/envsetup.py 25
}
@@ -89,7 +88,7 @@ reconf_default() {
python3 /root/envsetup/envsetup.py 204
}
-WOWZA_LICENSE() {
+wowza_license() {
python3 /root/envsetup/envsetup.py 205
}
@@ -148,7 +147,7 @@ case "$1" in
;;
"wrecette")
- WOWZA_LICENSE
+ wowza_license
reconf_dump_config
;;
--
GitLab