From 17edd5c92b59739486123d9507d6f643bfb9b699 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Sat, 8 Aug 2020 22:54:53 +0200 Subject: [PATCH] v4.4.2.0 Changelog: https://haproxy-wi.org/changelog.py#4_4_2 --- app/create_db.py | 2 +- app/templates/admin.html | 5 ++ app/templates/base.html | 42 ++++----- app/templates/hapservers.html | 4 +- app/templates/include/mon_installation.html | 94 ++++++++++++++++++++ app/templates/servers.html | 95 +-------------------- app/users.py | 2 + 7 files changed, 129 insertions(+), 115 deletions(-) create mode 100644 app/templates/include/mon_installation.html diff --git a/app/create_db.py b/app/create_db.py index f1a5abe8..8f9a248c 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -610,7 +610,7 @@ def update_db_v_4_4_2(**kwargs): def update_ver(**kwargs): con, cur = get_cur() - sql = """update version set version = '4.4.1.0'; """ + sql = """update version set version = '4.4.2.0'; """ try: cur.execute(sql) con.commit() diff --git a/app/templates/admin.html b/app/templates/admin.html index d0226137..42f47a7a 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -20,6 +20,7 @@
  • Services
  • Update
  • Backup
    • +
  • Monitoring installation
    • {% include 'include/login.html' %} @@ -447,6 +448,10 @@
    {% include 'include/admin_backup.html' %}
    + +
    + {% include 'include/mon_installation.html' %} +
    {% include 'include/admins_dialogs.html' %} {% include 'include/change_pass_form.html' %} diff --git a/app/templates/base.html b/app/templates/base.html index b9523160..257d5ff1 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -71,26 +71,29 @@ {% endif %} - + +
  • + Nginx + +
    • {% if role <= 2 %} -
  • - Nginx - -
    • -
  • - Keepalived - -
    • +
  • + Keepalived + +
    • + {% endif %}
  • SMON
    • + {% if role <= 2 %}
  • Servers