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

v5.2.2.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2_2
pull/304/head
Pavel Loginov 2021-07-21 10:57:58 +06:00
parent 5286856460
commit 2bf43e5d29
20 changed files with 79 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/funct.py
View File

@ -298,24 +298,26 @@ def ssh_connect(serv):
else:
ssh.connect(hostname=serv, port=ssh_port, username=ssh_user_name, password=ssh_user_password, timeout=11, banner_timeout=200)
return ssh
except paramiko.AuthenticationException:
return 'Authentication failed, please verify your credentials'
except paramiko.AuthenticationException as e:
logging('localhost', ' ' + str(e), haproxywi=1)
print('error: Authentication failed, please verify your credentials')
except paramiko.SSHException as sshException:
return 'error: Unable to establish SSH connection: %s ' % sshException
logging('localhost', ' ' + str(sshException), haproxywi=1)
print('error: Unable to establish SSH connection: %s ') % sshException
except paramiko.PasswordRequiredException as e:
logging('localhost', ' ' + str(e), haproxywi=1)
return 'error: %s ' % e
print('error: %s ') % e
except paramiko.BadHostKeyException as badHostKeyException:
logging('localhost', ' ' + str(badHostKeyException), haproxywi=1)
return 'error: Unable to verify server\'s host key: %s ' % badHostKeyException
print('error: Unable to verify server\'s host key: %s ') % badHostKeyException
except Exception as e:
logging('localhost', ' ' + str(e), haproxywi=1)
if e == "No such file or directory":
return 'error: %s. Check ssh key' % e
print('error: %s. Check SSH key') % e
elif e == "Invalid argument":
return 'error: Check the IP of the server'
print('error: Check the IP of the server')
else:
return str(e)
print(str(e))
def get_config(serv, cfg, **kwargs):

8
app/options.py
View File

@ -807,7 +807,7 @@ if serv is not None and act == "showMap":
node = ""
line_new2 = [1, ""]
i, k = 800, 800
j, m = 0, 0
j = 0
for line in conf:
if line.startswith('listen') or line.startswith('frontend'):
if "stats" not in line:
@ -854,9 +854,9 @@ if serv is not None and act == "showMap":
backend_server_port = ''
if j % 2 == 0:
G.add_node(line_new[0], pos=(k + 230, i - 335), label_pos=(k + 225, i - 180))
G.add_node(line_new[0], pos=(k + 250, i - 335), label_pos=(k + 215, i - 180))
else:
G.add_node(line_new[0], pos=(k - 230, i - 0), label_pos=(k - 225, i + 180))
G.add_node(line_new[0], pos=(k - 250, i - 0), label_pos=(k - 245, i + 180))
if line_new2[1] != "":
G.add_edge(node, line_new[0], port=backend_server_port)
@ -1394,7 +1394,7 @@ if form.getvalue('installwaf'):
if form.getvalue('update_haproxy_wi'):
service = form.getvalue('service')
services = ['roxy-wi-checker', 'haproxy-wi', 'roxy-wi-keep_alive', 'roxy-wi-smon', 'roxy-wi-metrics']
services = ['roxy-wi-checker', 'roxy-wi', 'roxy-wi-keep_alive', 'roxy-wi-smon', 'roxy-wi-metrics']
if service not in services:
print('error: ' + service + ' is not part of Roxy-WI')
sys.exit()

4
app/scripts/ansible/roles/haproxy/tasks/main.yml
View File

@ -28,7 +28,7 @@
- name: install HAProxy {{HAPVER}} on EL{{ansible_facts['distribution_major_version']}}
yum:
name:
- http://repo.haproxy-wi.org/haproxy-{{HAPVER}}.el{{ansible_facts['distribution_major_version']}}.x86_64.rpm
- http://repo.roxy-wi.org/haproxy-{{HAPVER}}.el{{ansible_facts['distribution_major_version']}}.x86_64.rpm
- socat
- rsyslog
state: present
@ -44,7 +44,7 @@
- name: Try to install another HAProxy {{HAPVER}} on EL{{ansible_facts['distribution_major_version']}}
yum:
name:
- http://repo1.haproxy-wi.org/haproxy-{{HAPVER}}.el{{ansible_facts['distribution_major_version']}}.x86_64.rpm
- http://repo1.roxy-wi.org/haproxy-{{HAPVER}}.el{{ansible_facts['distribution_major_version']}}.x86_64.rpm
- socat
- rsyslog
- bind-utils

12
app/templates/404.html
View File

@ -45,7 +45,7 @@
<div class="top-menu">
<div class="LogoText">
<span id="logo_text">
<a href="https://haproxy-wi.org" title="Roxy-WI site" target="_blank">
<a href="https://roxy-wi.org" title="Roxy-WI site" target="_blank">
<img src="/inc/images/logo_menu.png" alt="logo" width="170" />
</a>
</span>
@ -83,16 +83,16 @@
</a>
</div>
<div id="logo_footer">
<a href="https://haproxy-wi.org" title="Roxy-WI official site" target="_blank">
<a href="https://roxy-wi.org" title="Roxy-WI official site" target="_blank">
<img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" />
</a>
</div>
<div class="footer-div">
<a href="https://haproxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Privet cabinet for donaters">Cabinet</a>
<a href="https://roxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Privet cabinet for donaters">Cabinet</a>
<a href="https://github.com/Aidaho12/haproxy-wi/issues" class="footer-link" target="_blank">Help</a>
<a href="https://haproxy-wi.org/contacts.py" class="footer-link" target="_blank">Contact</a>
<a href="https://haproxy-wi.org" class="footer-link" target="_blank" title="About Roxy-WI">About</a>
<a href="https://haproxy-wi.org/cloud.py" class="footer-link" target="_blank" title="Roxy-WI Cloud">Cloud</a>
<a href="https://roxy-wi.org/contacts.py" class="footer-link" target="_blank">Contact</a>
<a href="https://roxy-wi.org" class="footer-link" target="_blank" title="About Roxy-WI">About</a>
<a href="https://roxy-wi.org/cloud.py" class="footer-link" target="_blank" title="Roxy-WI Cloud">Cloud</a>
</div>
</div>
<div id="current-user-groups-dialog" style="display: none;">

12
app/templates/500.html
View File

@ -45,7 +45,7 @@
<div class="top-menu">
<div class="LogoText">
<span id="logo_text">
<a href="https://haproxy-wi.org" title="Roxy-WI site" target="_blank">
<a href="https://roxy-wi.org" title="Roxy-WI site" target="_blank">
<img src="/inc/images/logo_menu.png" alt="logo" width="170" />
</a>
</span>
@ -86,16 +86,16 @@
</a>
</div>
<div id="logo_footer">
<a href="https://haproxy-wi.org" title="Roxy-WI official site" target="_blank">
<a href="https://roxy-wi.org" title="Roxy-WI official site" target="_blank">
<img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" />
</a>
</div>
<div class="footer-div">
<a href="https://haproxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Privet cabinet for donaters">Cabinet</a>
<a href="https://roxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Privet cabinet for donaters">Cabinet</a>
<a href="https://github.com/Aidaho12/haproxy-wi/issues" class="footer-link" target="_blank">Help</a>
<a href="https://haproxy-wi.org/contacts.py" class="footer-link" target="_blank">Contact</a>
<a href="https://haproxy-wi.org" class="footer-link" target="_blank" title="About Roxy-WI">About</a>
<a href="https://haproxy-wi.org/cloud.py" class="footer-link" target="_blank" title="Roxy-WI Cloud">Cloud</a>
<a href="https://roxy-wi.org/contacts.py" class="footer-link" target="_blank">Contact</a>
<a href="https://roxy-wi.org" class="footer-link" target="_blank" title="About Roxy-WI">About</a>
<a href="https://roxy-wi.org/cloud.py" class="footer-link" target="_blank" title="Roxy-WI Cloud">Cloud</a>
</div>
</div>
<div id="current-user-groups-dialog" style="display: none;">

14
app/templates/add.html
View File

@ -260,7 +260,7 @@
error-limit: {{ input('circuit_breaking_error_limit', type='number', value='50', style='width: 50px;') }}
on-error:
{{ select('circuit_breaking_on_error', values=on_error, class='force_close') }}
<div class="tooltip tooltipTop">Read more about Circuit Breaking <a href="https://haproxy-wi.org/description.py?description=circuit_breaking" title="Circuit Breaking" target="_blank">here</a></div>
<div class="tooltip tooltipTop">Read more about Circuit Breaking <a href="https://roxy-wi.org/description.py?description=circuit_breaking" title="Circuit Breaking" target="_blank">here</a></div>
</div>
</td>
</tr>
@ -644,7 +644,7 @@
error-limit: {{ input('circuit_breaking_error_limit', type='number', value='50', style='width: 50px;') }}
on-error:
{{ select('circuit_breaking_on_error', values=on_error, class='force_close') }}
<div class="tooltip tooltipTop">Read more about Circuit Breaking <a href="https://haproxy-wi.org/description.py?description=circuit_breaking" title="Circuit Breaking" target="_blank">here</a></div>
<div class="tooltip tooltipTop">Read more about Circuit Breaking <a href="https://roxy-wi.org/description.py?description=circuit_breaking" title="Circuit Breaking" target="_blank">here</a></div>
</div>
</td>
</tr>
@ -801,7 +801,7 @@
</div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
How to use pre saved option you can see in
<a href="https://haproxy-wi.org/description.py?description=saved" title="How to use pre saved options" target="_blank">
<a href="https://roxy-wi.org/description.py?description=saved" title="How to use pre saved options" target="_blank">
<b>this video</b>
</a>
</div>
@ -856,7 +856,7 @@
</div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
How to use pre saved servers you can see in
<a href="https://haproxy-wi.org/description.py?description=saved" title="How to use pre saved servers" target="_blank">
<a href="https://roxy-wi.org/description.py?description=saved" title="How to use pre saved servers" target="_blank">
<b>this video</b>
</a>
</div>
@ -952,7 +952,7 @@
</div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
How to use userlists you can read
<a href="https://haproxy-wi.org/description.py?description=userlist" title="How to use userlists" target="_blank">
<a href="https://roxy-wi.org/description.py?description=userlist" title="How to use userlists" target="_blank">
<b>here</b>
</a>
</div>
@ -1019,7 +1019,7 @@
</div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
How to use peers you can read
<a href="https://haproxy-wi.org/howto.py?howto=peers" title="How to use peers" target="_blank">
<a href="https://roxy-wi.org/howto.py?howto=peers" title="How to use peers" target="_blank">
<b>here</b>
</a>
</div>
@ -1084,7 +1084,7 @@
<div id="ajax"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
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
<a href="https://haproxy-wi.org/howto.py?howto=blacklist" title="How to create and manage blacklist" target="_blank">article</a>
<a href="https://roxy-wi.org/howto.py?howto=blacklist" title="How to create and manage blacklist" target="_blank">article</a>
</div>
<div id="dialog-confirm-cert-edit" title="View certificate " style="display: none;">
<span><b>Note:</b> Each new address must be specified from a new line</span>

18
app/templates/admin.html
View File

@ -64,7 +64,7 @@
<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://haproxy-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.py?howto=setup" title="How to setup servers, group and SSH credentials" target="_blank">article</a>
</div>
</div>
<div id="servers">
@ -90,17 +90,18 @@
<td class="padding10 first-collumn" style="width: 25%;">
Service
</td>
<td class="padding10 first-collumn" style="width: 35%;">
<td class="padding10 first-collumn">
Actions
</td>
<td>Version</td>
<td>Description</td>
<td class="padding10">Version</td>
<td style="width: 100%">Description</td>
<td><span onclick="loadServices()" class="service-reload" title="Reload services"></span></td>
</tr>
</thead>
<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://haproxy-wi.org/services.py" title="Roxy-WI services" target="_blank">here</a>
You can read about services <a href="https://roxy-wi.org/services.py" title="Roxy-WI services" target="_blank">here</a>
</div>
</div>
@ -115,18 +116,19 @@
<td>
Description
</td>
<td><span onclick="loadupdatehapwi()" class="service-reload" title="Reload Update"></span></td>
</tr>
</thead>
<tbody id="ajax-updatehapwi-body"></tbody>
</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. How to start using repository read <a href="https://haproxy-wi.org/installation.py" title="Roxy-WI installation" target="_blank">here</a>
For updating you have to use Roxy-WI RPM. How to start using repository read <a href="https://roxy-wi.org/installation.py" title="Roxy-WI installation" target="_blank">here</a>
<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://haproxy-wi.org/updates.py" title="Doc" target="_blank">docs</a>
and <a href="https://haproxy-wi.org/changelog.py" title="Changelog" target="_blank">changelog</a>
Read more about updating in <a href="https://roxy-wi.org/updates.py" 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>
</div>

2
app/templates/ajax/load_openvpn.html
View File

@ -83,7 +83,7 @@
<div style="text-align: center;">
<br />
<h3>You do not have installed OpenVPN client.
Read <a href="https://haproxy-wi.org/services.py?service=openvpn" title="OpenVPN" style="color: #5d9ceb;" target="_blank">hear</a>
Read <a href="https://roxy-wi.org/services.py?service=openvpn" title="OpenVPN" style="color: #5d9ceb;" target="_blank">hear</a>
how to install OpenVPN client</h3>
</div>
{% endif %}

2
app/templates/ajax/nginx_stats.html
View File

@ -121,6 +121,6 @@ u:hover div.tips {visibility:visible;}
</tr>
</table>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read the description about statuses <a href="https://haproxy-wi.org/description.py?description=nginx_status" title="Nginx status page description" target="_blank">here</a>
You can read the description about statuses <a href="https://roxy-wi.org/description.py?description=nginx_status" title="Nginx status page description" target="_blank">here</a>
</div>
{% endfor %}

2
app/templates/ha.html
View File

@ -94,7 +94,7 @@
</table>
<div id="ajax"></div>
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
Read <a href="https://haproxy-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?howto=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;">

2
app/templates/include/admin_backup.html
View File

@ -68,5 +68,5 @@
<br /><br />
<div id="ajax-backup"></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://haproxy-wi.org/description.py?description=backup" title="Backup description" target="_blank">here</a>
You can read the description of all parameters <a href="https://roxy-wi.org/description.py?description=backup" title="Backup description" target="_blank">here</a>
</div>

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

@ -165,7 +165,7 @@
<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://haproxy-wi.org/description.py?description=servers" title="Servers description" target="_blank">here</a>
or read HowTo in this <a href="https://haproxy-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.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>
</div>
{% endif %}

4
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://haproxy-wi.org/description.py?description=creds" title="Servers description" target="_blank">here</a>
or read HOWTO <a href="https://haproxy-wi.org/description.py?description=setup" title="How to setup servers, group and SSH credentials" target="_blank">here</a>
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>

4
app/templates/logs.html
View File

@ -88,14 +88,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://haproxy-wi.org/description.py?description=logs" title="Servers description" target="_blank">here</a>
You can read the descriptions about all logs <a href="https://roxy-wi.org/description.py?description=logs" title="Servers description" target="_blank">here</a>
</div>
{% elif serv == 'haproxy-wi.error.log' or serv == 'haproxy-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://haproxy-wi.org/description.py?description=logs" title="Servers description" target="_blank">here</a>
You can read the description about all logs file <a href="https://roxy-wi.org/description.py?description=logs" title="Servers description" target="_blank">here</a>
</div>
{% else %}
<script>

10
app/templates/ovw.html
View File

@ -119,7 +119,7 @@
{% endif %}
{% else %}
<span class="serverNone server-status" title="Metrics is not installed"></span>
<a href="https://haproxy-wi.org/services.py?service=metrics#installation" title="Metrics installation" target="_blank" class="logs_link">
<a href="https://roxy-wi.org/services.py?service=metrics#installation" title="Metrics installation" target="_blank" class="logs_link">
Metrics master
</a>
{% endif %}
@ -147,7 +147,7 @@
{% endif %}
{% else %}
<span class="serverNone server-status" title="Backends checker is not installed"></span>
<a href="https://haproxy-wi.org/services.py?service=checker#installation" title="Backends checker installation" target="_blank" class="logs_link">
<a href="https://roxy-wi.org/services.py?service=checker#installation" title="Backends checker installation" target="_blank" class="logs_link">
Checker master
</a>
{% endif %}
@ -175,7 +175,7 @@
{% endif %}
{% else %}
<span class="serverNone server-status" title="Auto start is not installed"></span>
<a href="https://haproxy-wi.org/services.py?service=auto_start#installation" title="Auto start installation" target="_blank" class="logs_link">
<a href="https://roxy-wi.org/services.py?service=auto_start#installation" title="Auto start installation" target="_blank" class="logs_link">
Auto start
</a>
{% endif %}
@ -233,7 +233,7 @@
</a>
{% else %}
<span title="SMON is not installed"><span class="serverNone server-status"></span></span>
<a href="https://haproxy-wi.org/services.py?service=smon" title="Simple monitoring ports installation" target="_blank" class="logs_link">
<a href="https://roxy-wi.org/services.py?service=smon" title="Simple monitoring ports installation" target="_blank" class="logs_link">
SMON
</a>
{% endif %}
@ -275,7 +275,7 @@
</a>
{% else %}
<span title="Port scanner is not installed"><span class="serverNone server-status"></span></span>
<a href="https://haproxy-wi.org/services.py?service=port_scanner" title="Port scanner" target="_blank" class="logs_link">
<a href="https://roxy-wi.org/services.py?service=port_scanner" title="Port scanner" target="_blank" class="logs_link">
Port scanner
</a>
{% endif %}

4
app/templates/portscanner.html
View File

@ -30,7 +30,7 @@
{% elif port_scanner_stderr != '' %}
<div style="text-align: center;">
<br />
<h3>You do not have installed Port scanner service. Read <a href="https://haproxy-wi.org/services.py?service=port_scanner"
<h3>You do not have installed Port scanner service. Read <a href="https://roxy-wi.org/services.py?service=port_scanner"
title="Port scanner" target="_blank">here</a> how to install Port scanner service</h3>
</div>
{% else %}
@ -145,7 +145,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://haproxy-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.py?service=portscanner" title="The Port scanner service description" target="_blank">article</a>
</div>
{% endif %}
<div id="dialog-confirm" style="display: none;">

12
app/templates/runtimeapi.html
View File

@ -74,7 +74,7 @@
</script>
<div id="ajaxruntime"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read the description of all Run Time API <a href="https://haproxy-wi.org/description.py?description=runtimeapi#commands" title="Run Time API description" target="_blank">here</a>
You can read the description of all Run Time API <a href="https://roxy-wi.org/description.py?description=runtimeapi#commands" title="Run Time API description" target="_blank">here</a>
</div>
</div>
{% if role <= 3 %}
@ -111,7 +111,7 @@
</table>
<div id="ajaxmaxconn"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read how it works <a href="https://haproxy-wi.org/description.py?description=runtimeapi#maxconn" title="Change Maxconn" target="_blank">here</a>
You can read how it works <a href="https://roxy-wi.org/description.py?description=runtimeapi#maxconn" title="Change Maxconn" target="_blank">here</a>
</div>
</div>
@ -157,7 +157,7 @@
</table>
<div id="ajaxip"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read how it works <a href="https://haproxy-wi.org/description.py?description=runtimeapi#ip" title="Change IP and Port" target="_blank">here</a>
You can read how it works <a href="https://roxy-wi.org/description.py?description=runtimeapi#ip" title="Change IP and Port" target="_blank">here</a>
</div>
</div>
<div id="table">
@ -189,7 +189,7 @@
</table>
<div id="ajaxtable"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read how it works <a href="https://haproxy-wi.org/description.py?description=runtimeapi#ip" title="Change IP and Port" target="_blank">here</a>
You can read how it works <a href="https://roxy-wi.org/description.py?description=runtimeapi#ip" title="Change IP and Port" target="_blank">here</a>
</div>
</div>
<div id="lists">
@ -221,7 +221,7 @@
</table>
<div id="ajaxlist"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read how it works <a href="https://haproxy-wi.org/description.py?description=runtimeapi#lists" title="Manage lists" target="_blank">here</a>
You can read how it works <a href="https://roxy-wi.org/description.py?description=runtimeapi#lists" title="Manage lists" target="_blank">here</a>
</div>
</div>
<div id="sessions">
@ -248,7 +248,7 @@
</table>
<div id="ajaxsessions"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
You can read how it works <a href="https://haproxy-wi.org/description.py?description=runtimeapi#lists" title="Manage lists" target="_blank">here</a>
You can read how it works <a href="https://roxy-wi.org/description.py?description=runtimeapi#lists" title="Manage lists" target="_blank">here</a>
</div>
</div>
{% endif %}

2
app/templates/servers.html
View File

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

26
app/templates/waf.html
View File

@ -45,7 +45,7 @@
var hostnamea = []
{% for s in servers_all %}
ip.push("{{s[2]}}");
var host = "{{s[1]}}";
var host = "{{s[2]}}";
host = host.replace(/\./g, '\\.');
hostnamea.push(host);
{% endfor %}
@ -56,21 +56,11 @@
{% else %}
<table class="overview">
<tr class="overviewHead">
<td class="padding10 first-collumn">
Server
</td>
<td class="padding10">
Actions
</td>
<td class="padding10">
WAF mode
</td>
<td>
Metrics
</td>
<td>
Manage rules
</td>
<td class="padding10 first-collumn">Server</td>
<td class="padding10">Actions</td>
<td class="padding10">WAF mode</td>
<td>Metrics</td>
<td>Manage rules</td>
<td>
<a onclick="showOverviewWaf(ip, hostnamea)" title="Refresh" style="float: right; margin-right: 25px;">
<span class="service-reload"></span>
@ -78,7 +68,7 @@
</td>
</tr>
{% for s in servers_all %}
<tr class="{{ loop.cycle('odd', 'even') }}" id="{{s[1]}}"></tr>
<tr class="{{ loop.cycle('odd', 'even') }}" id="{{s[2]}}"></tr>
{% endfor %}
</table>
@ -129,7 +119,7 @@
});
</script>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px; clear: both;">
You can read the description and watch a video about WAF <a href="https://haproxy-wi.org/description.py?description=waf" title="WAF" target="_blank">here</a>
You can read the description and watch a video about WAF <a href="https://roxy-wi.org/description.py?description=waf" title="WAF" target="_blank">here</a>
</div>
{% endif %}
{% endif %}

2
inc/users.js
View File

@ -1844,6 +1844,8 @@ function checkSshConnect(ip) {
success: function( data ) {
if (data.indexOf('error:') != '-1') {
toastr.error(data)
} else if(data.indexOf('failed') != '-1') {
toastr.error(data)
} else {
toastr.clear();
toastr.success('Connect is accepted');