v6.3.9.0

Changelog: https://roxy-wi.org/changelog#6_3_9

app/modules/service/installation.py

@@ -331,7 +331,11 @@ def keepalived_master_install():
 				hostname + '-VIP', vrrp_ip, group_id, '1', '1', '0', cred_id, ssh_settings['port'], f'VRRP IP for {master}',
 				haproxy, nginx, '0', firewall
 			)
-	os.remove(script)
+
+	try:
+		os.remove(script)
+	except Exception:
+		pass
 
 
 def keepalived_slave_install():
@@ -364,13 +368,18 @@ def keepalived_slave_install():
 	return_out = server_mod.subprocess_execute_with_rc(commands[0])
 
 	show_installation_output(return_out['error'], return_out['output'], 'slave Keepalived', rc=return_out['rc'])
-	os.remove(script)
+
 	try:
 		sql.update_server_master(master, slave)
 		sql.update_keepalived(slave)
 	except Exception as e:
 		print(e)
 
+	try:
+		os.remove(script)
+	except Exception:
+		pass
+
 
 def keepalived_masteradd():
 	master = form.getvalue('masteradd')

app/scripts/ansible/roles/keepalived/tasks/main.yml

@@ -4,10 +4,10 @@
     ansible_port: "{{SSH_PORT}}"
     
 - name: Add installation tasks
-  include: install.yml
+  include_tasks: install.yml
   when: (ADD_VRRP is not defined) or (ADD_VRRP != "1")
   
   
 - name: Add add vrrp tasks
-  include: add_vrrp.yml
-  when: (ADD_VRRP is defined) and (ADD_VRRP|length > 0)
+  include_tasks: add_vrrp.yml
+  when: (ADD_VRRP is defined) and (ADD_VRRP|length > 0)

app/templates/ha.html

@@ -57,12 +57,12 @@
 	</tr>
 	<tr class="overviewHead">
 		<td class="padding10 first-collumn"></td>
-		<td class="checkbox-head help_cursor"><span title="Roxy-WI will add VRRP address as a separated server">{{lang.words.add|title()}} VIRT</span></td>
+		<td class="help_cursor"><span title="Roxy-WI will add VRRP address as a separated server">{{lang.words.add|title()}} VIRT</span></td>
 		<td class="checkbox-head help_cursor" style="padding-left: 20px;" title="If checked, the Keepalived master will not release VRRP if the service is down">{{lang.words.stay|title()}} {{lang.words.as}} {{lang.words.master|title()}}</td>
 		<td class="checkbox-head">SYN-flood {{lang.words.protection}}</td>
-		<td class="checkbox-head help_cursor" style="padding: 10px 10px 10px 0;"><span title="Roxy-WI will try to install HAProxy">HAProxy</span></td>
+		<td class="checkbox-head help_cursor" style="padding: 10px 10px 10px 5px;"><span title="Roxy-WI will try to install HAProxy">HAProxy</span></td>
 		<td class="checkbox-head help_cursor" style="display: none" id="haproxy_docker_td_header"><span title="Roxy-WI will install HAProxy as Docker container">Docker</span></td>
-		<td class="checkbox-head help_cursor"><span title="Roxy-WI will try to install NGINX">NGINX</span></td>
+		<td class="help_cursor" style="padding-left: 5px;"><span title="Roxy-WI will try to install NGINX">NGINX</span></td>
 		<td class="checkbox-head help_cursor" style="display: none" id="nginx_docker_td_header"><span title="Roxy-WI will install NGINX as Docker container">Docker</span></td>
 		<td></td>
 		<td></td>
@@ -122,8 +122,8 @@
 		<td></td>
 		<td></td>
 		<td></td>
-		<td class="padding10 first-collumn checkbox-head"><span title="If checked Roxy-WI will restart Keepalived">{{lang.words.restart|title()}}</span></td>
-		<td class="checkbox-head help_cursor" title="If checked, Keepalived master will reclaim VRRP after recovered">{{lang.words.return|title()}} {{lang.words.to}} {{lang.words.master|title()}} state</td>
+		<td class="padding10 first-collumn" style="padding-left: 10px;"><span title="If checked Roxy-WI will restart Keepalived">{{lang.words.restart|title()}}</span></td>
+		<td class="help_cursor" title="If checked, Keepalived master will reclaim VRRP after recovered">{{lang.words.return|title()}} {{lang.words.to}} {{lang.words.master|title()}} state</td>
 		<td></td>
 	</tr>
 	<tr>

inc/css/style-6.3.9.css

@@ -593,6 +593,9 @@ ul{
 .ui-selectmenu-open, .ui-selectmenu-menu {
 	z-index: 1010 !important;
 }
+.ui-selectmenu-button {
+	padding: 0.3em 1em 0.2em 0.4em !important;
+}
 .ui-dialog {
 	z-index: 1000 !important;
 }