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

v6.1.2.0 

Change log: https://roxy-wi.org/changelog.py#6_1_2
pull/334/head v6.1.2.0
Pavel Loginov 2022-07-30 20:00:36 +03:00
parent f39b7e0e89
commit b02acc475a
13 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/admin.html
View File

@ -64,8 +64,8 @@
<br /><span class="add-button" title="Add group" id="add-group-button">+ Add</span>
<br /><br />
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
How to setup groups you can read in this <a href="https://roxy-wi.org/howto.py?howto=server_groups" title="How to use groups and roles" target="_blank">article</a>
and this <a href="https://roxy-wi.org/howto.py?howto=setup" title="How to setup servers, group and SSH credentials" target="_blank">article</a>
How to setup groups you can read in this <a href="https://roxy-wi.org/howto/roles-and-groups" title="How to use groups and roles" target="_blank">article</a>
and this <a href="https://roxy-wi.org/howto/setup" title="How to setup servers, group and SSH credentials" target="_blank">article</a>
</div>
</div>
<div id="servers">
@ -102,7 +102,7 @@
<tbody id="ajax-services-body"></tbody>
</table>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
You can read about services <a href="https://roxy-wi.org/services.py" title="Roxy-WI services" target="_blank">here</a>
You can read about services <a href="https://roxy-wi.org/services" title="Roxy-WI services" target="_blank">here</a>
</div>
</div>
@ -122,12 +122,12 @@
</table>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
<b style="font-size: 20px; display: block; padding-bottom: 10px;">Note:</b>
For updating you have to use Roxy-WI RPM or DEB. Read <a href="https://roxy-wi.org/installation.py" title="Roxy-WI installation" target="_blank">here</a>
For updating you have to use Roxy-WI RPM or DEB. Read <a href="https://roxy-wi.org/installation" title="Roxy-WI installation" target="_blank">here</a>
how to start using repository
<br /><br />
If the Roxy-WI server uses a proxy to connect to the Internet, add the proxy settings to yum.conf
<br /><br />
Read more about updating in <a href="https://roxy-wi.org/updates.py" title="Doc" target="_blank">docs</a>
Read more about updating in <a href="https://roxy-wi.org/updates" title="Doc" target="_blank">docs</a>
and <a href="https://roxy-wi.org/changelog.py" title="Changelog" target="_blank">changelog</a>
</div>
<div id="ajax-update"></div>
@ -184,4 +184,4 @@
});
</script>
<link href="/inc/servers.css" rel="stylesheet"/>
{% endblock %}
{% endblock %}

8
app/templates/ajax/load_telegram.html
View File

@ -16,7 +16,7 @@
<div style="text-align: center;">
<br />
<h3>You have not installed Backends checker
Read <a href="https://roxy-wi.org/services.py?service=checker#installation" title="Checker installation" style="color: #5d9ceb;" target="_blank">hear</a>
Read <a href="https://roxy-wi.org/services/checker#installation" title="Checker installation" style="color: #5d9ceb;" target="_blank">hear</a>
how to install Checker service</h3>
</div>
{% else %}
@ -148,9 +148,9 @@
<br /><br />
<div id="ajax-telegram"></div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
You can read the description of all parameters <a href="https://roxy-wi.org/description.py?description=checker" title="Servers description" target="_blank">here</a>,
How to create and use Telegram bot in this <a href="https://roxy-wi.org/howto.py?howto=checker" title="How to create Telegram bot and use it with Roxy-WI" target="_blank">article</a>,
How to create and use Slack APP in this <a href="https://roxy-wi.org/howto.py?howto=slack" title="How to create Slack APP and use it with Roxy-WI" target="_blank">article</a>
You can read the description of all parameters <a href="https://roxy-wi.org/description/checker" title="Servers description" target="_blank">here</a>,
How to create and use Telegram bot in this <a href="https://roxy-wi.org/howto/create-telegram-bot" title="How to create Telegram bot and use it with Roxy-WI" target="_blank">article</a>,
How to create and use Slack APP in this <a href="https://roxy-wi.org/howto/create-slack-app" title="How to create Slack APP and use it with Roxy-WI" target="_blank">article</a>
</div>
</div>
<div id="checker_settings">

12
app/templates/ajax/load_updatehapwi.html
View File

@ -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 %}

6
app/templates/base.html
View File

@ -76,7 +76,7 @@
<li><a href="/app/versions.py" title="Working with versions HAProxy configs" class="version head-submenu">Versions</a></li>
<li><a href="/app/add.py#ssl" title="Add proxy: Upload SSL certificates - Roxy-WI" class="cert head-submenu" id="add3">SSL</a></li>
<li><a href="/app/add.py#lists" title="Add proxy: Create and upload whitelists or blacklists - Roxy-WI" class="lists head-submenu" id="add7">Lists</a></li>
<li><a href="/app/waf.py" title="Web application firewall" class="waf-menu head-submenu">WAF</a> </li>
<li><a href="/app/waf.py?service=haproxy" title="Web application firewall" class="waf-menu head-submenu">WAF</a> </li>
{% endif %}
</ul>
</li>
@ -275,9 +275,9 @@
<a href="https://roxy-wi.org" class="footer-link" target="_blank" title="About Roxy-WI">About</a>
<a href="https://github.com/hap-wi/roxy-wi/issues" class="footer-link" target="_blank" title="Community help">Help</a>
<a href="https://sd.roxy-wi.org" class="footer-link" target="_blank" title="Service Desk">SD</a>
<a href="https://roxy-wi.org/contacts.py" class="footer-link" target="_blank">Contacts</a>
<a href="https://roxy-wi.org/contacts" class="footer-link" target="_blank">Contacts</a>
<a href="https://roxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Private cabinet">Cabinet</a>
<a href="https://roxy-wi.org/legal.py" class="footer-link" target="_blank" title="Legal Note">Legal</a>
<a href="https://roxy-wi.org/legal" class="footer-link" target="_blank" title="Legal Note">Legal</a>
</div>
</div>
<div id="show-user-settings">

2
app/templates/ha.html
View File

@ -130,7 +130,7 @@
</table>
<div id="ajax"></div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
Read <a href="https://roxy-wi.org/howto.py?howto=ha_cluster" title="How to create high available cluster" target="_blank">How to create high available cluster</a>
Read <a href="https://roxy-wi.org/howto.py/ha_cluster" title="How to create high available cluster" target="_blank">How to create high available cluster</a>
</div>
<div id="server_creating" style="display: none;">
<ul style="padding: 20px 20px 0px 20px;font-size: 15px;">

4
app/templates/include/admin_servers.html
View File

@ -183,8 +183,8 @@
<br /><br />
<div id="checkSshConnect"></div>
<div class="add-note addName alert alert-info" style="width: inherit; margin-right: 15px;">
You can read the description of all parameters <a href="https://roxy-wi.org/description.py?description=servers" title="Servers description" target="_blank">here</a>
or read HowTo in this <a href="https://roxy-wi.org/howto.py?howto=setup" title="How to setup servers, group and SSH credentials" target="_blank">article</a>
You can read the description of all parameters <a href="https://roxy-wi.org/description/servers" title="Servers description" target="_blank">here</a>
or read HowTo in this <a href="https://roxy-wi.org/howto/setup" title="How to setup servers, group and SSH credentials" target="_blank">article</a>
</div>
{% endif %}
{% if user_status == 0 or user_plan == 'user' %}

6
app/templates/include/admin_ssh.html
View File

@ -86,6 +86,6 @@
</table>
<div id="ajax-ssh"></div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
You can read the description of all parameters <a href="https://roxy-wi.org/description.py?description=creds" title="Servers description" target="_blank">here</a>
or read HOWTO <a href="https://roxy-wi.org/description.py?description=setup" title="How to setup servers, group and SSH credentials" target="_blank">here</a>
</div>
You can read the description of all parameters <a href="https://roxy-wi.org/description/creds" title="Servers description" target="_blank">here</a>
or read HOWTO <a href="https://roxy-wi.org/howto/setup" title="How to setup servers, group and SSH credentials" target="_blank">here</a>
</div>

7
app/templates/include/mon_installation.html
View File

@ -127,6 +127,7 @@
</table>
<div id="ajaxmon"></div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
Read <a href="https://roxy-wi.org/services.py?service=grafana" title="About Grafana and Prometheus servers" target="_blank">About Grafana and Prometheus servers</a>
and <a href="https://roxy-wi.org/howto.py?howto=exporters" title="About Exporters" target="_blank">About Exporters</a>
</div>
Read <a href="https://roxy-wi.org/services/grafana" title="About Grafana and Prometheus servers" target="_blank">About Grafana and Prometheus servers</a>
and <a href="https://roxy-wi.org/howto/exporters" title="About Exporters" target="_blank">About Exporters</a>
</div>

16
app/templates/logs.html
View File

@ -87,14 +87,14 @@
}
</script>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read the descriptions about all logs <a href="https://roxy-wi.org/description.py?description=logs" title="Servers description" target="_blank" class="link">here</a>
You can read the descriptions about all logs <a href="https://roxy-wi.org/description/logs" title="Servers description" target="_blank" class="link">here</a>
</div>
{% elif serv == 'roxy-wi.error.log' or serv == 'roxy-wi.access.log' %}
<script>
showApacheLog('{{serv}}');
</script>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read the description about all logs file <a href="https://roxy-wi.org/description.py?description=logs" title="Servers description" target="_blank" class="link">here</a>
You can read the description about all logs file <a href="https://roxy-wi.org/description/logs" title="Servers description" target="_blank" class="link">here</a>
</div>
{% else %}
<script>
@ -102,10 +102,14 @@
$('#waf').prop('checked', true);
{% endif %}
{% if waf != '1' %}
showRemoteLogFiles()
$( "#serv" ).on('selectmenuchange',function() {
showRemoteLogFiles();
});
{% if remote_file %}
showLog()
{% else %}
showRemoteLogFiles()
$( "#serv" ).on('selectmenuchange',function() {
showRemoteLogFiles();
});
{% endif %}
{% else %}
showLog()
{% endif %}

8
app/templates/metrics.html
View File

@ -22,14 +22,13 @@
<div style="text-align: center;">
<br />
<h3>You have not installed Metrics service.
Read <a href="https://roxy-wi.org/services.py?service=metrics#installation" title="Metrics installation" style="color: #5d9ceb;" target="_blank">hear</a>
Read <a href="https://roxy-wi.org/services/metrics#installation" title="Metrics installation" style="color: #5d9ceb;" target="_blank">hear</a>
how to install Metrics service</h3>
</div>
{% else %}
{% if servers|length == 0 %}
{% include 'include/getstarted.html' %}
{% else %}
{% if service == 'haproxy' %}
<table style="min-width: 40%;">
<tr class="overviewHead">
<th colspan=13 style="background-color: #d1ecf1">
@ -40,7 +39,6 @@
</tr>
</table>
<div id="table_metrics"></div>
{% endif %}
<div style="padding-left: 25px;float: left;margin-top: 6px;">
<b>Time range:</b>
<select title="Choose time range" id="time-range">
@ -92,15 +90,13 @@
getNginxChartData('{{s.ip}}')
{% endif %}
{% endfor %}
{% if service == 'haproxy' %}
if (localStorage.getItem('table_metrics') == 0 || localStorage.getItem('table_metrics') === null) {
$('#dis_table_metric').css('display', 'none');
} else {
$('#en_table_metric').css('display', 'none');
loadMetrics();
}
{% endif %}
});
});
metrics.then();
}
showMetrics()

4
app/templates/portscanner.html
View File

@ -33,7 +33,7 @@
{% elif port_scanner_stderr != '' %}
<div style="text-align: center;">
<br />
<h3>You have not installed Port scanner service. Read <a href="https://roxy-wi.org/services.py?service=port_scanner"
<h3>You have not installed Port scanner service. Read <a href="https://roxy-wi.org/services.py/portscanner"
title="Port scanner" target="_blank">here</a> how to install Port scanner service</h3>
</div>
{% else %}
@ -148,7 +148,7 @@
{% endfor %}
</div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px; margin-top: 45%">
Read about Port scanner service in this <a href="https://roxy-wi.org/services.py?service=portscanner" title="The Port scanner service description" target="_blank">article</a>
Read about Port scanner service in this <a href="https://roxy-wi.org/services/portscanner" title="The Port scanner service description" target="_blank">article</a>
</div>
{% endif %}
<div id="dialog-confirm" style="display: none;">

2
app/templates/servers.html
View File

@ -153,7 +153,7 @@
</table>
<div id="ajax-geoip"></div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px; margin-bottom: 15px;">
Read the "how to" in this <a href="https://roxy-wi.org/howto.py?howto=geoip" title="GeoLite2 description" target="_blank">article</a>
Read the "how to" in this <a href="https://roxy-wi.org/howto/geoip" title="GeoLite2 description" target="_blank">article</a>
</div>
<table style="min-width: 40%;">
<tr class="overviewHead">

4
app/templates/smon.html
View File

@ -10,7 +10,7 @@
{% elif smon_error != '' %}
<div style="text-align: center;">
<br />
<h3>You have not installed SMON service. Read <a href="https://roxy-wi.org/services.py?service=smon"
<h3>You have not installed SMON service. Read <a href="https://roxy-wi.org/services/smon"
title="Simple monitoring network ports with alerting via Telegram and WEB panel" target="_blank">here</a> how to install SMON service</h3>
</div>
{% elif smon_status.0 == 'failed' %}
@ -73,7 +73,7 @@
<br /><br />
<div id="ajax"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read the description of all parameters <a href="https://roxy-wi.org/services.py?service=smon" title="SMON service description" target="_blank">here</a>
You can read the description of all parameters <a href="https://roxy-wi.org/services/smon" title="SMON service description" target="_blank">here</a>
</div>
<div id="smon-add-table" style="display: none;">
<table class="overview">