v3.4.9.1

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`));

app/templates/add.html

@@ -14,7 +14,7 @@
 			<a href=/app/login.py title="Login" class="login"> Login</a>
 		{% endif %}
 	</ul>
-	<div id="create">
+	<div id="create" style="height: 50%;">
 		<div class="div-pannel">
 			<div class="div-server">
 				<div class="server-name">
@@ -49,6 +49,12 @@
 				</div>			
 			</div>
 		</div>
+		{% if add %}
+		<div class="alert alert-success" style="margin-left: 20px; clear: both;">	
+			<h3>{{ add }} was success added</h3>
+			{{ conf_add }}
+		</div>
+		{% endif %}
 	</div>
 	<div id="listen">
 		<form name="add-listner" action="/app/add.py">
@@ -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
 		</div>
 	</div>
-	{% if add %}
+	
-		<div class="alert alert-success">	
-			<h3>{{ add }} was success added</h3>
-			{{ conf_add }}
-		</div>
-	{% endif %}
 	<div id="dialog-confirm-delete" title="Are you sure you want to delete?" style="display: none;">
 	  <p><span class="ui-icon ui-icon-alert" style="float:left; margin:3px 12px 20px 0;"></span>Deleting irreversibly all data will be lost?</p>
 	</div>

app/templates/hapservers.html

@@ -22,7 +22,7 @@
 					<a id="{{ s.2 }}" class="stop" title="Stop HAProxy service">
 						<img src=/inc/images/stop.png alt="stop" class="icon" width="17px" onclick="confirmAjaxAction('stop', 'hap', '{{s.2}}')">
 					</a>
-					<a id="{{ s.2 }}" class="restart" title="Restart HAProxy service">
+					<a id="{{ s.2 }}" class="restart" title="Restart HAProxy service" onclick="confirmAjaxAction('restart', 'hap', '{{s.2}}')">
 						<img src=/inc/images/update.png alt="restart" class="icon">
 					</a>
 				</span>

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 after<a id='"+ip+"' class='restart' title='Restart HAproxy service'>restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>");					
+					$("#apply_div").html("You made changes to the server: "+ip+". Changes will take effect only after<a id='"+ip+"' class='restart' title='Restart HAproxy service' onclick=\"confirmAjaxAction('stop', 'hap', '"+ip+"')\">restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>");					
 				} else {
-					$("#apply_div").html("You made changes to the server: "+ip+". Changes will take effect only after restart. <a href='overview.py' title='Overview'>Go to Overview page and restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>");
+					$("#apply_div").html("You made changes to the server: "+ip+". Changes will take effect only after restart. <a href='hapservers.py' title='Overview'>Go to the HAProxy Overview page and restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>");
 				}
 				$.getScript('/inc/overview.js');
 			}

update.sh

@@ -19,16 +19,16 @@ fi
 cd app/
 ./create_db.py
 
-pip3 install -r ../requirements.txt
+LOG='/tmp/haproxy-wi_install.log'
-pip3.5 install -r ../requirements.txt
+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 "################"