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

View File

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

View File

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