Changed config management.

envsetup.py

@@ -156,7 +156,6 @@ class EnvSetup():
                 if target == str(action['index']) and action['fct']:
                     found = True
                     log('Starting action %s: %s setup.' % (action['index'], action['label']))
-                    log('Please wait, the setup is in progress...    ')
                     try:
                         os.chdir(action['path'])
                         if isinstance(action['fct'], str):

default-conf.sh → global-conf.sh

 #!/bin/bash
-# Envsetup default configuration file
 # DO NOT EDIT THIS FILE!
 # Put your local configuration in conf.sh
 
+
+# Default configuration values
+# ----------------------------
+
 # -- Constants --
 CYAN='\033[0;36m'
 GREEN='\033[0;32m'
@@ -119,3 +122,17 @@ HA_LB1='ha-lb3'
 HA_LB1_IP='192.168.41.177'
 HA_LB2=
 HA_LB2_IP=
+
+
+# Upstream configuration override
+# -------------------------------
+# (file generated by Panel / Skyreach)
+if [ -f "/root/envsetup/auto-generated-conf.sh" ]; then
+	source "/root/envsetup/auto-generated-conf.sh"
+fi
+
+# Local configuration override
+# ----------------------------
+if [ -f "/root/envsetup/conf.sh" ]; then
+	source "/root/envsetup/conf.sh"
+fi

utils.py

@@ -6,7 +6,8 @@ import subprocess
 import sys
 
 
-DEFAULT_CONF_PATH = 'default-conf.sh'
+DEFAULT_CONF_PATH = 'global-conf.sh'
+AUTO_CONF_PATH = 'auto-generated-conf.sh'
 CONF_PATH = 'conf.sh'
 CONF = dict()
 
@@ -51,15 +52,17 @@ def load_conf():
     base_dir = get_dir(__file__)
     files = (
         (os.path.join(base_dir, DEFAULT_CONF_PATH), True),
+        (os.path.join(base_dir, AUTO_CONF_PATH), False),
         (os.path.join(base_dir, CONF_PATH), False),
     )
     only_default = True
     override = OrderedDict()
     for path, is_default in files:
         if not os.path.exists(path):
-            log('The configuration file for EnvSetup script does not exist.\nPath of configuration file: %s' % path, error=True)
             if is_default:
+                log('The configuration file for EnvSetup script does not exist.\nPath of configuration file: %s' % path, error=True)
                 return dict()
+            continue
         # Load conf
         with open(path, 'r') as fo:
             content = fo.read()