From e6c50ae758db53aa7b6700128658f7493d7f8f26 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Tue, 7 Sep 2021 14:18:27 +0600 Subject: [PATCH] v5.2.5.0 Changelog: https://haproxy-wi.org/changelog.py#5_2_5 --- app/funct.py | 3 ++- app/templates/add.html | 22 +++++++++++----------- app/templates/include/add_proxy.html | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/funct.py b/app/funct.py index 4e9ca33b..984d5a55 100644 --- a/app/funct.py +++ b/app/funct.py @@ -1409,4 +1409,5 @@ def is_service_active(server_ip: str, service_name: str): cmd = ['systemctl is-active ' + service_name] out = ssh_command(server_ip, cmd) - return True if 'active' in out else False + out = out.strip() + return True if 'active' == out else False diff --git a/app/templates/add.html b/app/templates/add.html index f86295af..30b2914d 100644 --- a/app/templates/add.html +++ b/app/templates/add.html @@ -26,8 +26,8 @@
  • Frontend
  • Backend
  • SSL certificates
    • -
  • Options
    • -
  • Servers
    • +
  • Options
    • +
  • Servers
  • Userlists
  • Peers
  • Lists
    • @@ -791,10 +791,10 @@
    -
    +
    In this section you can create, edit and delete options with given parameters. And after use them as autocomplete in the "Add" sections
    -
    +
    How to use pre-saved option you can see in this video @@ -846,10 +846,10 @@
    -
    +
    In this section you can create, edit and delete servers. And after use them as autocomplete in the "Add" sections
    -
    +
    How to use pre-saved servers you can see in this video @@ -945,7 +945,7 @@
    In this section you can create userlists. And after use them in the "Add" sections
    -
    +
    Read here @@ -1007,13 +1007,13 @@
    Note: If you would like to use HAProxy services as Master-Master cluster you must set local servers - hostnames as peers servers names. Otherwise peers will not work + hostnames as peers servers names. Otherwise, peers will not work
    Note: If you would like to use HAProxy services as Master-Slave cluster you must set local server - hostname for master server as peer server name. Otherwise peers will not work + hostname for master server as peer server name. Otherwise, peers will not work
    -
    +
    Read here @@ -1083,7 +1083,7 @@
    -
    +
    In this section you can create and edit black and white lists. And after use them in the HAProxy configs or in the "Add proxy" pages. Read how to use it in this article
    diff --git a/app/templates/include/add_proxy.html b/app/templates/include/add_proxy.html index 3bfeb71e..b746847d 100644 --- a/app/templates/include/add_proxy.html +++ b/app/templates/include/add_proxy.html @@ -58,7 +58,7 @@
    - Create presaved options + Create an option template
    Create, edit and delete options with given parameters. And after use them as autocomplete in the "Add" sections @@ -110,7 +110,7 @@
    - Create presaved servers + Create a server template
    Create, edit and delete servers. And after use them as autocomplete in the "Add" sections