From b02acc475af7aeb3070e94b3ba3f6ae6d29f3666 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Sat, 30 Jul 2022 20:00:36 +0300 Subject: [PATCH] v6.1.2.0 Change log: https://roxy-wi.org/changelog.py#6_1_2 --- app/templates/admin.html | 12 ++++++------ app/templates/ajax/load_telegram.html | 8 ++++---- app/templates/ajax/load_updatehapwi.html | 12 ++++++------ app/templates/base.html | 6 +++--- app/templates/ha.html | 2 +- app/templates/include/admin_servers.html | 4 ++-- app/templates/include/admin_ssh.html | 6 +++--- app/templates/include/mon_installation.html | 7 ++++--- app/templates/logs.html | 16 ++++++++++------ app/templates/metrics.html | 8 ++------ app/templates/portscanner.html | 4 ++-- app/templates/servers.html | 2 +- app/templates/smon.html | 4 ++-- 13 files changed, 46 insertions(+), 45 deletions(-) diff --git a/app/templates/admin.html b/app/templates/admin.html index 0a819dce..5987278c 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -64,8 +64,8 @@
+ Add

- How to setup groups you can read in this article - and this article + How to setup groups you can read in this article + and this article
@@ -102,7 +102,7 @@
- You can read about services here + You can read about services here
@@ -122,12 +122,12 @@
Note: - For updating you have to use Roxy-WI RPM or DEB. Read here + For updating you have to use Roxy-WI RPM or DEB. Read here how to start using repository

If the Roxy-WI server uses a proxy to connect to the Internet, add the proxy settings to yum.conf

- Read more about updating in docs + Read more about updating in docs and changelog
@@ -184,4 +184,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/ajax/load_telegram.html b/app/templates/ajax/load_telegram.html index c267d09f..c8dd04fa 100644 --- a/app/templates/ajax/load_telegram.html +++ b/app/templates/ajax/load_telegram.html @@ -16,7 +16,7 @@

You have not installed Backends checker - Read hear + Read hear how to install Checker service

{% else %} @@ -148,9 +148,9 @@

- You can read the description of all parameters here, - How to create and use Telegram bot in this article, - How to create and use Slack APP in this article + You can read the description of all parameters here, + How to create and use Telegram bot in this article, + How to create and use Slack APP in this article
diff --git a/app/templates/ajax/load_updatehapwi.html b/app/templates/ajax/load_updatehapwi.html index f82c6655..ef86a299 100644 --- a/app/templates/ajax/load_updatehapwi.html +++ b/app/templates/ajax/load_updatehapwi.html @@ -39,7 +39,7 @@ {% if s.0 == 'roxy-wi-smon' %} {% set service_name = 'SMON' %} {% set service_link = 'smon' %} - {% set desc_link = 'https://roxy-wi.org/services.py?service=smon' %} + {% set desc_link = 'https://roxy-wi.org/services/smon' %} {% if s.3|float < smon_ver|float %} {% set is_need_update = 1 %} {% endif %} @@ -47,7 +47,7 @@ {% elif s.0 == 'roxy-wi-checker' %} {% set service_name = 'Checker' %} {% set service_link = 'checker' %} - {% set desc_link = 'https://roxy-wi.org/services.py?service=checker' %} + {% set desc_link = 'https://roxy-wi.org/services/checker' %} {% if s.3|float < checker_ver|float %} {% set is_need_update = 1 %} {% endif %} @@ -55,7 +55,7 @@ {% elif s.0 == 'roxy-wi-keep_alive' %} {% set service_name = 'Auto start' %} {% set service_link = 'auto_start' %} - {% set desc_link = 'https://roxy-wi.org/services.py?service=auto_start' %} + {% set desc_link = 'https://roxy-wi.org/services/auto_start' %} {% if s.3|float < keep_ver|float %} {% set is_need_update = 1 %} {% endif %} @@ -63,7 +63,7 @@ {% elif s.0 == 'roxy-wi-metrics' %} {% set service_name = 'Metrics' %} {% set service_link = 'metrics' %} - {% set desc_link = 'https://roxy-wi.org/services.py?service=metrics' %} + {% set desc_link = 'https://roxy-wi.org/services/metrics' %} {% if s.3|float < metrics_ver|float %} {% set is_need_update = 1 %} {% endif %} @@ -71,7 +71,7 @@ {% elif s.0 == 'roxy-wi-portscanner' %} {% set service_name = 'Port scanner' %} {% set service_link = 'portscanner' %} - {% set desc_link = 'https://roxy-wi.org/services.py?service=' + service_link %} + {% set desc_link = 'https://roxy-wi.org/services/' + service_link %} {% if s.3|float < portscanner_ver|float %} {% set is_need_update = 1 %} {% endif %} @@ -79,7 +79,7 @@ {% elif s.0 == 'roxy-wi-socket' %} {% set service_name = 'Socket service' %} {% set service_link = 'socket' %} - {% set desc_link = 'https://roxy-wi.org/services.py?service=' + service_link %} + {% set desc_link = 'https://roxy-wi.org/services/' + service_link %} {% if s.3|float < socket_ver|float %} {% set is_need_update = 1 %} {% endif %} diff --git a/app/templates/base.html b/app/templates/base.html index 4fc9103c..e27eb582 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -76,7 +76,7 @@
  • Versions
  • SSL
  • Lists
    • -
  • WAF
    • +
  • WAF
    • {% endif %} @@ -275,9 +275,9 @@ About Help SD - Contacts + Contacts Cabinet - Legal + Legal
    diff --git a/app/templates/ha.html b/app/templates/ha.html index af701c7c..8e3f3906 100644 --- a/app/templates/ha.html +++ b/app/templates/ha.html @@ -130,7 +130,7 @@
    - Read How to create high available cluster + Read How to create high available cluster
    diff --git a/app/templates/include/mon_installation.html b/app/templates/include/mon_installation.html index 30f448d8..c1c28ea0 100644 --- a/app/templates/include/mon_installation.html +++ b/app/templates/include/mon_installation.html @@ -127,6 +127,7 @@
    - Read About Grafana and Prometheus servers - and About Exporters -
    \ No newline at end of file + Read About Grafana and Prometheus servers + and About Exporters +
    + \ No newline at end of file diff --git a/app/templates/logs.html b/app/templates/logs.html index 894f1908..d0925bf0 100644 --- a/app/templates/logs.html +++ b/app/templates/logs.html @@ -87,14 +87,14 @@ }
    - You can read the descriptions about all logs here + You can read the descriptions about all logs here
    {% elif serv == 'roxy-wi.error.log' or serv == 'roxy-wi.access.log' %}
    - You can read the description about all logs file here + You can read the description about all logs file here
    {% else %}