github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v6.0.0.0 

Changelog: https://roxy-wi.org/changelog.py#6
pull/321/head
Pavel Loginov 2022-04-20 12:08:10 +03:00
parent 56a634ef60
commit 1fbca36884
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/servers.py
View File

@ -15,7 +15,7 @@ try:
user_group = funct.get_user_group(id=1) user_group = funct.get_user_group(id=1)
settings = sql.get_setting('', all=1) settings = sql.get_setting('', all=1)
geoip_country_codes = sql.select_geoip_country_codes() geoip_country_codes = sql.select_geoip_country_codes()
services = sql.select_services()
except Exception as e: except Exception as e:
pass pass
@ -36,5 +36,6 @@ output_from_parsed_template = template.render(title="Servers: ",
page="servers.py", page="servers.py",
geoip_country_codes=geoip_country_codes, geoip_country_codes=geoip_country_codes,
user_services=user_services, user_services=user_services,
ldap_enable=ldap_enable) ldap_enable=ldap_enable,
services=services)
print(output_from_parsed_template) print(output_from_parsed_template)

4
app/users.py
View File

@ -19,6 +19,7 @@ try:
settings = sql.get_setting('', all=1) settings = sql.get_setting('', all=1)
ldap_enable = sql.get_setting('ldap_enable') ldap_enable = sql.get_setting('ldap_enable')
grafana, stderr = funct.subprocess_execute("systemctl is-active grafana-server") grafana, stderr = funct.subprocess_execute("systemctl is-active grafana-server")
services = sql.select_services()
except Exception: except Exception:
pass pass
@ -38,5 +39,6 @@ template = template.render(title="Admin area: Manage users",
grafana=''.join(grafana), grafana=''.join(grafana),
page="users.py", page="users.py",
user_services=user_services, user_services=user_services,
ldap_enable=ldap_enable) ldap_enable=ldap_enable,
services=services)
print(template) print(template)