mediaimport & deprecated conf

deprecated-conf.sh

+#!/bin/bash
+# DO NOT EDIT THIS FILE!
+# Put your local configuration in conf.sh
+
+# -- Database --
+DB_MYSQL_ROOT_PWD=
+
+# -- Backup server specific (burp) --
+BURP_STATUS_IP=
+BURPUI_PASSWORD='1234'
+# FQDN
+BURP_SERVER=''
+BURP_MAIL_DEST='sysadmin@ubicast.eu'
+# default mediaserver
+BURP_CLIENT_NAME=
+BURP_CLIENT_MAIL_DEST='sysadmin@ubicast.eu'
+
+# -- FTP --
+# move uploaded files into hotfolder
+# login:pass CSV separated
+#FTP_INCOMING_USERS='ftpuser1:ftppass1,ftpuser2:ftppass2'
+FTP_INCOMING_USERS=
+
+# -- HOTFOLDER --
+# csv-separated
+HOTFOLDERS='/home/ftp/storage/hotfolder'

global-conf.sh

@@ -76,7 +76,6 @@ DB_HOST='127.0.0.1'
 DB_PORT='5432'
 # if no password is set, it will not be changed or set
 DB_PG_ROOT_PWD=
-DB_MYSQL_ROOT_PWD=
 
 # -- Celerity --
 CELERITY_SIGNING_KEY='test'
@@ -101,16 +100,6 @@ PROXY_HTTPS=
 # PROXY_EXCLUDE is used in no_proxy env (a comma separated list of domains)
 PROXY_EXCLUDE=
 
-# -- Backup server specific (burp) --
-BURP_STATUS_IP=
-BURPUI_PASSWORD='1234'
-# FQDN
-BURP_SERVER=''
-BURP_MAIL_DEST='sysadmin@ubicast.eu'
-# default mediaserver
-BURP_CLIENT_NAME=
-BURP_CLIENT_MAIL_DEST='sysadmin@ubicast.eu'
-
 # -- Fail2ban specific settings --
 FAIL2BAN_ENABLED='1'
 FAIL2BAN_SEND_EMAIL='0'
@@ -123,15 +112,9 @@ BACKUP_SERVER=''
 # CSV separated
 LOCAL_BACKUP_FOLDERS=''
 
-# -- FTP --
-# move uploaded files into hotfolder
-# login:pass CSV separated
-#FTP_INCOMING_USERS='ftpuser1:ftppass1,ftpuser2:ftppass2'
-FTP_INCOMING_USERS=
-
-# -- HOTFOLDER --
-# csv-separated
-HOTFOLDERS='/home/ftp/storage/hotfolder'
+# -- MediaImport --
+MEDIAIMPORT_USER=
+MEDIAIMPORT_PASSWD=
 
 # -- Tester config --
 # separate values with commas
@@ -156,6 +139,12 @@ GREEN='\033[0;32m'
 RED='\033[0;31m'
 NC='\033[0;0m'
 
+# Deprecated configuration kept for backward compatibility
+# --------------------------------------------------------
+if [ -f "/root/envsetup/deprecated-conf.sh" ]; then
+	source "/root/envsetup/deprecated-conf.sh"
+fi
+
 # Upstream configuration override
 # -------------------------------
 # (file generated by Panel / Skyreach)