diff --git a/app/haproxy-wi.db.sql b/app/haproxy-wi.db.sql index 2298262a..15778da0 100644 --- a/app/haproxy-wi.db.sql +++ b/app/haproxy-wi.db.sql @@ -15,5 +15,5 @@ CREATE TABLE IF NOT EXISTS `cred` (`id` integer primary key AUTO_INCREMENT, `nam CREATE TABLE IF NOT EXISTS `telegram` (`id` integer primary key auto_increment, `token` VARCHAR ( 64 ), `chanel_name` INTEGER NOT NULL DEFAULT 1, `groups` INTEGER NOT NULL DEFAULT 1); CREATE TABLE IF NOT EXISTS `metrics` (`serv` varchar(64), curr_con INTEGER, cur_ssl_con INTEGER, sess_rate INTEGER, max_sess_rate INTEGER,`date` DATETIME default '0000-00-00 00:00:00'); CREATE TABLE IF NOT EXISTS `settings` (`param` varchar(64) UNIQUE, value varchar(64), section varchar(64), `desc` varchar(100)); -CREATE TABLE IF NOT EXISTS `version` (`version` varchar(64)); +CREATE TABLE IF NOT EXISTS `version` (`version` varchar(64), `hash` INTEGER NOT NULL DEFAULT 1,); CREATE TABLE IF NOT EXISTS `options` ( `id` INTEGER NOT NULL, `options` VARCHAR ( 64 ), `groups` VARCHAR ( 120 ), PRIMARY KEY(`id`)); \ No newline at end of file diff --git a/app/templates/add.html b/app/templates/add.html index 5b5355d2..6d305cf2 100644 --- a/app/templates/add.html +++ b/app/templates/add.html @@ -14,7 +14,7 @@ Login {% endif %} -
+
@@ -49,6 +49,12 @@
+ {% if add %} +
+

{{ add }} was success added

+ {{ conf_add }} +
+ {% endif %}
@@ -716,12 +722,7 @@ In this section you can create, edit and delete options with given parameters. And after use them as autocomplete in the "Add" sections
- {% if add %} -
-

{{ add }} was success added

- {{ conf_add }} -
- {% endif %} + diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html index 19e31782..c03c3eff 100644 --- a/app/templates/hapservers.html +++ b/app/templates/hapservers.html @@ -22,7 +22,7 @@ stop - + restart diff --git a/inc/script.js b/inc/script.js index 3802fe17..5ab041b7 100644 --- a/inc/script.js +++ b/inc/script.js @@ -62,11 +62,11 @@ if(Cookies.get('restart')) { if(data.indexOf('ok') != '-1') { $("#apply").css('display', 'block'); $("#apply_div").css('width', '850px'); - if (cur_url[0] == "overview.py") { + if (cur_url[0] == "hapservers.py") { $("#apply_div").css('width', '650px'); - $("#apply_div").html("You made changes to the server: "+ip+". Changes will take effect only afterrestartX"); + $("#apply_div").html("You made changes to the server: "+ip+". Changes will take effect only afterrestartX"); } else { - $("#apply_div").html("You made changes to the server: "+ip+". Changes will take effect only after restart. Go to Overview page and restartX"); + $("#apply_div").html("You made changes to the server: "+ip+". Changes will take effect only after restart. Go to the HAProxy Overview page and restartX"); } $.getScript('/inc/overview.js'); } diff --git a/update.sh b/update.sh index 69421017..cea99957 100644 --- a/update.sh +++ b/update.sh @@ -19,16 +19,16 @@ fi cd app/ ./create_db.py -pip3 install -r ../requirements.txt -pip3.5 install -r ../requirements.txt +LOG='/tmp/haproxy-wi_install.log' +pip3.5 install -r /var/www/haproxy-wi/requirements.txt &> $LOG + chmod +x ../update.sh echo "################" echo "" -echo "" -echo "" echo "ATTENTION!!! New config file name is: haproxy-wi.cfg" echo "" echo "" +echo "Install log in $LOG" echo "" -echo "################" +echo "################" \ No newline at end of file