mirror of https://github.com/Aidaho12/haproxy-wi
v3.7.3
parent
f05b21aaa7
commit
b80b98c2b2
|
@ -27,6 +27,7 @@ serv = form.getvalue('serv')
|
||||||
if serv:
|
if serv:
|
||||||
servers = sql.select_servers(server=serv)
|
servers = sql.select_servers(server=serv)
|
||||||
autorefresh = 1
|
autorefresh = 1
|
||||||
|
hap_configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir')
|
||||||
else:
|
else:
|
||||||
servers = sql.get_dick_permit()
|
servers = sql.get_dick_permit()
|
||||||
autorefresh = 0
|
autorefresh = 0
|
||||||
|
@ -56,6 +57,18 @@ for s in servers:
|
||||||
except:
|
except:
|
||||||
servers_with_status.append('Cannot get last date')
|
servers_with_status.append('Cannot get last date')
|
||||||
|
|
||||||
|
if serv:
|
||||||
|
try:
|
||||||
|
sections = funct.get_sections(hap_configs_dir +funct.get_files()[0])
|
||||||
|
except:
|
||||||
|
try:
|
||||||
|
cfg = hap_configs_dir + s[2] + "-" + funct.get_data('config') + ".cfg"
|
||||||
|
error = funct.get_config(s[2], cfg)
|
||||||
|
sections = funct.get_sections(cfg)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
servers_with_status.append(sections)
|
||||||
|
|
||||||
servers_with_status1.append(servers_with_status)
|
servers_with_status1.append(servers_with_status)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -235,7 +235,7 @@
|
||||||
{% set new_ver_without_dots = versions.3 %}
|
{% set new_ver_without_dots = versions.3 %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if new_ver_without_dots is defined and current_ver_without_dots is defined and new_ver is defined and new_ver_without_dots is defined %}
|
{% if new_ver_without_dots is defined and current_ver_without_dots is defined and new_ver is defined and new_ver_without_dots is defined %}
|
||||||
<a href="https://haproxy-wi.org/changelog.py" title="View changelog" target="_blank" style="color: #000;">
|
<a style="color: #000; cursor: pointer;">
|
||||||
{% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %}
|
{% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %}
|
||||||
<span id="show-updates-button" class="new-version-exists">v{{current_ver}} </span>
|
<span id="show-updates-button" class="new-version-exists">v{{current_ver}} </span>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
|
@ -90,7 +90,24 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="ajax-server-{{s.0}}" class="ajax-server"></div>
|
<div id="ajax-server-{{s.0}}" class="ajax-server"></div>
|
||||||
|
{% if serv %}
|
||||||
|
{% if s.8 is defined %}
|
||||||
|
<div class="div-server">
|
||||||
|
<div class="server-name">
|
||||||
|
Backends:
|
||||||
|
</div>
|
||||||
|
<div style="margin-top: 10px;">
|
||||||
|
{% for b in s.8 %}
|
||||||
|
<a href="/app/sections.py?serv={{ s.2 }}§ion={{b}}" title="Edit backend {{b}}" target="_blank" style="padding-right: 10px;">
|
||||||
|
{{b}}
|
||||||
|
</a>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -42,7 +42,7 @@ if serv is not None and form.getvalue('del') is not None:
|
||||||
try:
|
try:
|
||||||
os.remove(os.path.join(hap_configs_dir, form.getvalue(get)))
|
os.remove(os.path.join(hap_configs_dir, form.getvalue(get)))
|
||||||
file.add(form.getvalue(get) + "<br />")
|
file.add(form.getvalue(get) + "<br />")
|
||||||
funct.logging(serv, "versions.py deleted config: %s" % form.getvalue(get))
|
funct.logging(serv, "versions.py were deleted configs: %s" % form.getvalue(get))
|
||||||
except OSError as e:
|
except OSError as e:
|
||||||
stderr = "Error: %s - %s." % (e.filename,e.strerror)
|
stderr = "Error: %s - %s." % (e.filename,e.strerror)
|
||||||
print('<meta http-equiv="refresh" content="10; url=versions.py?serv=%s&open=open">' % form.getvalue('serv'))
|
print('<meta http-equiv="refresh" content="10; url=versions.py?serv=%s&open=open">' % form.getvalue('serv'))
|
||||||
|
|
Loading…
Reference in New Issue