From 0f0907549457547a4952f3d36aee2346f2832c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Mon, 16 Jan 2017 12:01:55 +0100
Subject: [PATCH] Moved HCA setup to deprecated.
---
{6.HCA => 203.HCA}/0_setup.py | 2 +-
{6.HCA => 203.HCA}/http.ini | 0
{6.HCA => 203.HCA}/rtmp.ini | 0
launcher.sh | 1 -
4 files changed, 1 insertion(+), 2 deletions(-)
rename {6.HCA => 203.HCA}/0_setup.py (96%)
rename {6.HCA => 203.HCA}/http.ini (100%)
rename {6.HCA => 203.HCA}/rtmp.ini (100%)
diff --git a/6.HCA/0_setup.py b/203.HCA/0_setup.py
similarity index 96%
rename from 6.HCA/0_setup.py
rename to 203.HCA/0_setup.py
index 1815c30e..f7defd93 100644
--- a/6.HCA/0_setup.py
+++ b/203.HCA/0_setup.py
@@ -23,7 +23,7 @@ def setup(interactive=True):
print('Configuration of HCA http.ini file skipped (no FTP passwords in config).')
# rtmp.ini
live_pwd = utils.get_conf('WOWZA_LIVE_PWD')
- if live_pwd:
+ if live_pwd and os.path.exists('/var/www/streaming'):
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')),
diff --git a/6.HCA/http.ini b/203.HCA/http.ini
similarity index 100%
rename from 6.HCA/http.ini
rename to 203.HCA/http.ini
diff --git a/6.HCA/rtmp.ini b/203.HCA/rtmp.ini
similarity index 100%
rename from 6.HCA/rtmp.ini
rename to 203.HCA/rtmp.ini
diff --git a/launcher.sh b/launcher.sh
index b5f44c26..ec28eb27 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -36,7 +36,6 @@ monitor() {
mediaserver() {
python3 /root/envsetup/envsetup.py 3
python3 /root/envsetup/envsetup.py 5
- python3 /root/envsetup/envsetup.py 6
python3 /root/envsetup/envsetup.py 8
python3 /root/envsetup/envsetup.py 61
python3 /root/envsetup/envsetup.py 7
--
GitLab