From a9e99f44a1b000256c55b9336064eb4ea848f31b Mon Sep 17 00:00:00 2001 From: Aidaho12 Date: Thu, 4 Oct 2018 20:56:02 +0600 Subject: [PATCH] v3.2.13 Config name bug --- app/funct.py | 2 +- ...haproxy-webintarface.config => haproxy-wi.cfg} | 1 + update.sh | 15 +++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) rename app/{haproxy-webintarface.config => haproxy-wi.cfg} (99%) diff --git a/app/funct.py b/app/funct.py index 89bb4bf6..da800f3a 100644 --- a/app/funct.py +++ b/app/funct.py @@ -13,7 +13,7 @@ def get_app_dir(): def get_config_var(sec, var): from configparser import ConfigParser, ExtendedInterpolation try: - path_config = get_app_dir()+"/haproxy-webintarface.config" + path_config = get_app_dir()+"/haproxy-wi.cfg" config = ConfigParser(interpolation=ExtendedInterpolation()) config.read(path_config) except: diff --git a/app/haproxy-webintarface.config b/app/haproxy-wi.cfg similarity index 99% rename from app/haproxy-webintarface.config rename to app/haproxy-wi.cfg index 9d497819..a73e5203 100644 --- a/app/haproxy-webintarface.config +++ b/app/haproxy-wi.cfg @@ -17,3 +17,4 @@ mysql_user = haproxy-wi mysql_password = haproxy-wi mysql_db = haproxywi mysql_host = 127.0.0.1 + diff --git a/update.sh b/update.sh index 322fb87e..f1ab2fb1 100644 --- a/update.sh +++ b/update.sh @@ -26,10 +26,21 @@ pip3.5 install -r ../requirements.txt echo "" echo "#################" echo "Change in config:" -diff --expand-tabs -W 100 -y /tmp/haproxy-webintarface.config haproxy-webintarface.config +diff --expand-tabs -W 100 -y /tmp/haproxy-webintarface.config haproxy-wi.cfg echo "" echo "Please set your config" echo "" echo "################" echo "Your config saved in /tmp/haproxy-webintarface.config. Please compare with new and set your env back" -echo "" \ No newline at end of file +echo "" +echo "" +echo "" +echo "################" +echo "" +echo "" +echo "" +echo "ATTENTION!!! New config file name: haproxy-wi.cfg" +echo "" +echo "" +echo "" +echo "################" \ No newline at end of file