mirror of https://github.com/Aidaho12/haproxy-wi
parent
15257c92ce
commit
f415a437e0
|
@ -917,12 +917,12 @@ def get_dick_permit(**kwargs):
|
|||
if kwargs.get('nginx'):
|
||||
nginx = "and nginx = 1"
|
||||
if kwargs.get('keepalived'):
|
||||
nginx = "and keepalived = 1"
|
||||
keepalived = "and keepalived = 1"
|
||||
|
||||
if funct.check_user_group(token=token):
|
||||
con, cur = get_cur()
|
||||
if grp == '1' and not only_group:
|
||||
sql = """ select * from servers where enable = 1 %s %s %s %s order by pos""" % (disable, type_ip, nginx, ip)
|
||||
sql = """ select * from servers where enable = 1 %s %s %s %s %s order by pos""" % (disable, type_ip, nginx, keepalived, ip)
|
||||
else:
|
||||
sql = """ select * from servers where groups = '{group}' and (enable = 1 {disable}) {type_ip} {ip} {haproxy} {nginx} {keepalived} order by pos
|
||||
""".format(group=grp, disable=disable, type_ip=type_ip, ip=ip, haproxy=haproxy, nginx=nginx, keepalived=keepalived)
|
||||
|
|
|
@ -241,10 +241,11 @@
|
|||
</div>
|
||||
<div class="footer-div">
|
||||
<a href="https://haproxy-wi.org" class="footer-link" target="_blank" title="About HAProxy-WI">About</a>
|
||||
<a href="https://github.com/Aidaho12/haproxy-wi/issues" class="footer-link" target="_blank" title="Community help">Help</a>
|
||||
<a href="https://github.com/hap-wi/haproxy-wi/issues" class="footer-link" target="_blank" title="Community help">Help</a>
|
||||
<a href="https://sd.haproxy-wi.org" class="footer-link" target="_blank" title="Service Desk">SD</a>
|
||||
<a href="https://haproxy-wi.org/contacts.py" class="footer-link" target="_blank">Contacts</a>
|
||||
<a href="https://haproxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Private cabinet">Cabinet</a>
|
||||
<a href="https://haproxy-wi.org/legal.py" class="footer-link" target="_blank" title="Legal Note">Legal</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="show-user-settings">
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
<span title="Actions with the master config will automatically apply on the slave">Slave for</span>
|
||||
</th>
|
||||
<th class="cred-field">Credentials</th>
|
||||
<th class="cred-field" style="min-width: 70px;"></th>
|
||||
<th style="width: 100%">Description</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
|
@ -142,9 +141,6 @@
|
|||
<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<button onclick="scanPorts('{{server.0}}')" title="Scanning open/filtered ports for the server {{server.1}}">scan</button>
|
||||
</td>
|
||||
<td>
|
||||
{% set id = 'desc-' + server.0|string() %}
|
||||
{% if server.11 != "None" %}
|
||||
|
|
Loading…
Reference in New Issue