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

v5.1.4.0 

Changelog: https://haproxy-wi.org/changelog.py#5_1_4
pull/304/head
Pavel Loginov 2021-06-02 13:28:07 +06:00
parent e3d7861a6a
commit fbb02a9743
32 changed files with 264 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/create_db.py
View File

@ -1253,7 +1253,7 @@ def update_db_v_5_1_3(**kwargs):
def update_ver(): def update_ver():
con, cur = get_cur() con, cur = get_cur()
sql = """update version set version = '5.1.3.0'; """ sql = """update version set version = '5.1.4.0'; """
try: try:
cur.execute(sql) cur.execute(sql)
con.commit() con.commit()

7
app/options.py
View File

@ -1353,7 +1353,7 @@ if form.getvalue('update_haproxy_wi'):
service = form.getvalue('service') service = form.getvalue('service')
services = ['checker_haproxy', 'haproxy-wi', 'keep_alive', 'smon', 'metrics_haproxy'] services = ['checker_haproxy', 'haproxy-wi', 'keep_alive', 'smon', 'metrics_haproxy']
if service not in services: if service not in services:
print('error: ' + service + ' is not part of HAProxy-WI') print('error: ' + service + ' is not part of Roxy-WI')
sys.exit() sys.exit()
funct.update_haproxy_wi(service) funct.update_haproxy_wi(service)
@ -1758,6 +1758,7 @@ if form.getvalue('newserver') is not None:
desc = form.getvalue('desc') desc = form.getvalue('desc')
if sql.add_server(hostname, ip, group, typeip, enable, master, cred, port, desc, haproxy, nginx, firewall): if sql.add_server(hostname, ip, group, typeip, enable, master, cred, port, desc, haproxy, nginx, firewall):
from jinja2 import Environment, FileSystemLoader from jinja2 import Environment, FileSystemLoader
env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
@ -3357,10 +3358,10 @@ if form.getvalue('loadopenvpn'):
if form.getvalue('check_telegram'): if form.getvalue('check_telegram'):
telegram_id = form.getvalue('check_telegram') telegram_id = form.getvalue('check_telegram')
mess = 'Test message from HAProxy-WI' mess = 'Test message from Roxy-WI'
funct.telegram_send_mess(mess, telegram_channel_id=telegram_id) funct.telegram_send_mess(mess, telegram_channel_id=telegram_id)
if form.getvalue('check_slack'): if form.getvalue('check_slack'):
slack_id = form.getvalue('check_slack') slack_id = form.getvalue('check_slack')
mess = 'Test message from HAProxy-WI' mess = 'Test message from Roxy-WI'
funct.slack_send_mess(mess, slack_channel_id=slack_id) funct.slack_send_mess(mess, slack_channel_id=slack_id)

10
app/templates/404.html
View File

@ -1,6 +1,6 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>404 - Page not found - HAProxy-WI</title> <title>404 - Page not found - Roxy-WI</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Pragma" content="no-cache" />
@ -45,7 +45,7 @@
<div class="top-menu"> <div class="top-menu">
<div class="LogoText"> <div class="LogoText">
<span id="logo_text"> <span id="logo_text">
<a href="https://haproxy-wi.org" title="HAProxy-WI site" target="_blank"> <a href="https://haproxy-wi.org" title="Roxy-WI site" target="_blank">
<img src="/inc/images/logo_menu.png" alt="logo" width="170" /> <img src="/inc/images/logo_menu.png" alt="logo" width="170" />
</a> </a>
</span> </span>
@ -83,7 +83,7 @@
</a> </a>
</div> </div>
<div id="logo_footer"> <div id="logo_footer">
<a href="https://haproxy-wi.org" title="HAProxy-WI official site" target="_blank"> <a href="https://haproxy-wi.org" title="Roxy-WI official site" target="_blank">
<img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" /> <img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" />
</a> </a>
</div> </div>
@ -91,8 +91,8 @@
<a href="https://haproxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Privet cabinet for donaters">Cabinet</a> <a href="https://haproxy-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://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/contacts.py" class="footer-link" target="_blank">Contact</a>
<a href="https://haproxy-wi.org" class="footer-link" target="_blank" title="About HAProxy-WI">About</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="HAProxy-WI Cloud">Cloud</a> <a href="https://haproxy-wi.org/cloud.py" class="footer-link" target="_blank" title="Roxy-WI Cloud">Cloud</a>
</div> </div>
</div> </div>
<div id="current-user-groups-dialog" style="display: none;"> <div id="current-user-groups-dialog" style="display: none;">

12
app/templates/500.html
View File

@ -1,6 +1,6 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>500 - Internal error - HAProxy-WI</title> <title>500 - Internal error - Roxy-WI</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Pragma" content="no-cache" />
@ -45,7 +45,7 @@
<div class="top-menu"> <div class="top-menu">
<div class="LogoText"> <div class="LogoText">
<span id="logo_text"> <span id="logo_text">
<a href="https://haproxy-wi.org" title="HAProxy-WI site" target="_blank"> <a href="https://haproxy-wi.org" title="Roxy-WI site" target="_blank">
<img src="/inc/images/logo_menu.png" alt="logo" width="170" /> <img src="/inc/images/logo_menu.png" alt="logo" width="170" />
</a> </a>
</span> </span>
@ -68,7 +68,7 @@
<h4>Sorry, but something went wrong..... Check httpd error log and <h4>Sorry, but something went wrong..... Check httpd error log and
<a href="https://github.com/Aidaho12/haproxy-wi/issues" title="GitHub issues">create issue on GitHub</a> <a href="https://github.com/Aidaho12/haproxy-wi/issues" title="GitHub issues">create issue on GitHub</a>
or write <a href="https://t.me/haproxy_wi" title="HAProxy-WI chat">to the chat</a> or write <a href="https://t.me/haproxy_wi" title="Roxy-WI chat">to the chat</a>
</h4> </h4>
</center> </center>
</div> </div>
@ -86,7 +86,7 @@
</a> </a>
</div> </div>
<div id="logo_footer"> <div id="logo_footer">
<a href="https://haproxy-wi.org" title="HAProxy-WI official site" target="_blank"> <a href="https://haproxy-wi.org" title="Roxy-WI official site" target="_blank">
<img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" /> <img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" />
</a> </a>
</div> </div>
@ -94,8 +94,8 @@
<a href="https://haproxy-wi.org/cabinet.py" class="footer-link" target="_blank" title="Privet cabinet for donaters">Cabinet</a> <a href="https://haproxy-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://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/contacts.py" class="footer-link" target="_blank">Contact</a>
<a href="https://haproxy-wi.org" class="footer-link" target="_blank" title="About HAProxy-WI">About</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="HAProxy-WI Cloud">Cloud</a> <a href="https://haproxy-wi.org/cloud.py" class="footer-link" target="_blank" title="Roxy-WI Cloud">Cloud</a>
</div> </div>
</div> </div>
<div id="current-user-groups-dialog" style="display: none;"> <div id="current-user-groups-dialog" style="display: none;">

92
app/templates/add.html
View File

@ -21,15 +21,16 @@
<script src="/inc/add.js"></script> <script src="/inc/add.js"></script>
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#create" title="Add proxy: Create proxy - HAProxy-WI">Create proxy</a></li> <li><a href="#create" title="Add proxy: Create proxy - Roxy-WI">Create proxy</a></li>
<li><a href="#listen" title="Add proxy: Create Listen - HAProxy-WI">Listen</a></li> <li><a href="#listen" title="Add proxy: Create Listen - Roxy-WI">Listen</a></li>
<li><a href="#frontend" title="Add proxy: Create Frontend - HAProxy-WI">Frontend</a></li> <li><a href="#frontend" title="Add proxy: Create Frontend - Roxy-WI">Frontend</a></li>
<li><a href="#backend" title="Add proxy: Create Backend - HAProxy-WI">Backend</a></li> <li><a href="#backend" title="Add proxy: Create Backend - Roxy-WI">Backend</a></li>
<li><a href="#ssl" title="Add proxy: Upload SSL certificates - HAProxy-WI">SSL certificates</a></li> <li><a href="#ssl" title="Add proxy: Upload SSL certificates - Roxy-WI">SSL certificates</a></li>
<li><a href="#option" title="Add proxy: Pre-saved options - HAProxy-WI">Options</a></li> <li><a href="#option" title="Add proxy: Pre-saved options - Roxy-WI">Options</a></li>
<li><a href="#add-servers" title="Add proxy: Pre-saved servers - HAProxy-WI">Servers</a></li> <li><a href="#add-servers" title="Add proxy: Pre-saved servers - Roxy-WI">Servers</a></li>
<li><a href="#userlist" title="Add proxy: Create Userlists - HAProxy-WI">Userlists</a></li> <li><a href="#userlist" title="Add proxy: Create Userlists - Roxy-WI">Userlists</a></li>
<li><a href="#lists" title="Add proxy: Create and upload whitelists or blacklists - HAProxy-WI">Lists</a></li> <li><a href="#peers" title="Add proxy: Create peers - Roxy-WI">Peers</a></li>
<li><a href="#lists" title="Add proxy: Create and upload whitelists or blacklists - Roxy-WI">Lists</a></li>
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>
<ul id='browse_histroy'></ul> <ul id='browse_histroy'></ul>
@ -90,7 +91,8 @@
<div id="https-hide-listen" style="display: none;"> <div id="https-hide-listen" style="display: none;">
<br /><span class="tooltip tooltipTop">Enter name of pem file, or press the "down" button:</span><br /> <br /><span class="tooltip tooltipTop">Enter name of pem file, or press the "down" button:</span><br />
{{ input('path-cert-listen', name="cert", placeholder="some_cert.pem", size='39') }}<br /> {{ input('path-cert-listen', name="cert", placeholder="some_cert.pem", size='39') }}<br />
<label for="ssl-check-listen" style="margin-top: 5px;">Disable ssl verify on servers?</label><input type="checkbox" id="ssl-check-listen" name="ssl-check" value="ssl-check" checked> <label for="ssl-dis-check-listen" style="margin-top: 5px;">Disable SSL check</label><input type="checkbox" id="ssl-dis-check-listen" name="ssl-dis-check" value="ssl-dis-check">
<label for="ssl-check-listen" style="margin-top: 5px;">Disable SSL verify on servers</label><input type="checkbox" id="ssl-check-listen" name="ssl-check" value="ssl-check" checked>
</div> </div>
</td> </td>
</tr> </tr>
@ -500,7 +502,8 @@
<input type="checkbox" id="https-backend" name="ssl" value="https"> <input type="checkbox" id="https-backend" name="ssl" value="https">
</span> </span>
<div id="https-hide-backend" style="display: none;"> <div id="https-hide-backend" style="display: none;">
<label for="ssl-check" style="margin-top: 5px;">Disable SSL verify on servers</label><input type="checkbox" id="ssl-check" name="ssl-check" value="ssl-check" checked> <label for="ssl-dis-check-backend" style="margin-top: 5px;">Disable SSL check</label><input type="checkbox" id="ssl-dis-check-backend" name="ssl-dis-check" value="ssl-dis-check">
<label for="ssl-check-backend" style="margin-top: 5px;">Disable SSL verify on servers</label><input type="checkbox" id="ssl-check-backend" name="ssl-check" value="ssl-check" checked>
</div> </div>
</td> </td>
</tr> </tr>
@ -953,6 +956,73 @@
</a> </a>
</div> </div>
</div> </div>
<div id="peers">
<form name="add-userlist" id="add-peers" action="/app/add.py" method="post">
<table>
<caption><h3>Add Peers</h3></caption>
<tr>
<td class="addName">Select server: </td>
<td class="addOption">
<select required name="serv" id="peers_serv">
<option disabled selected>Choose server</option>
{% for select in selects %}
<option value="{{ select.2 }}">{{ select.1 }}</option>
{% endfor %}
</select>
<div class="tooltip tooltipTop"><b>Note:</b> If you reconfigure Master server, Slave will reconfigured automatically</div>
</td>
<td rowspan="4" class="add-note addName alert-info">
The peers section enables the replication of stick table data between two or more HAProxy instances.
</td>
</tr>
<tr>
<td class="addName">Peers name:</td>
<td class="addOption">
{{ input('peers-name', title="Peers name", placeholder="peers name") }}
</td>
</tr>
<tr>
<td class="addName">Peers servers:</td>
<td class="addOption">
<span name="add_peers">
<input name="servers_name" required title="Peer name" size=14 placeholder="haproxy1" class="form-control">:
<input name="servers" required title="Peer IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
<input name="server_port" required title="Peer port" size=3 placeholder="yyy" class="form-control add_server_number" type="number">
<br />
<input name="servers_name" required title="Peer name" size=14 placeholder="haproxy2" class="form-control">:
<input name="servers" title="Peer IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control second-server"><span class="second-server">:</span>
<input name="server_port" title="Peer port" size=3 placeholder="yyy" class="form-control second-server add_server_number" type="number">
</span>
<span>
<a class="link add-server backend_server" name="add-peer-input" title="Add peer server" style="cursor: pointer;"></a>
</span>
</td>
</tr>
<tr>
<td class="addButton">
<a class="ui-button ui-widget ui-corner-all" title="Add Userlist" onclick="addProxy('add-peers')">Add Peers</a>
</td>
<td class="addButton">
<a class="ui-button ui-widget ui-corner-all" title="Generate config and show it" onclick="generateConfig('add-peers')">Generate config</a>
</td>
</tr>
</table>
</form>
<div class="alert addName alert-info" style="width: inherit; margin-right: 15px;">
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
</div>
<div class="alert addName alert-info" style="width: inherit; margin-right: 15px;">
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
</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">
<b>here</b>
</a>
</div>
</div>
<div id="lists"> <div id="lists">
<table class="overview"> <table class="overview">
<tr class="overviewHead"> <tr class="overviewHead">

34
app/templates/admin.html
View File

@ -6,17 +6,17 @@
{% include 'include/del_confirm.html' %} {% include 'include/del_confirm.html' %}
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#users" title="Admin area: Manage users - HAProxy-WI">Users</a></li> <li><a href="#users" title="Admin area: Manage users - Roxy-WI">Users</a></li>
<li><a href="#groups" title="Admin area: Manage groups - HAProxy-WI">Groups</a></li> <li><a href="#groups" title="Admin area: Manage groups - Roxy-WI">Groups</a></li>
<li><a href="#servers" title="Admin area: Manage servers - HAProxy-WI">Servers</a></li> <li><a href="#servers" title="Admin area: Manage servers - Roxy-WI">Servers</a></li>
<li><a href="#ssh" title="Admin area: Manage SSH credentials - HAProxy-WI">SSH credentials</a></li> <li><a href="#ssh" title="Admin area: Manage SSH credentials - Roxy-WI">SSH credentials</a></li>
<li><a href="#checker" title="Admin area: Manage checker - HAProxy-WI">Checker</a></li> <li><a href="#checker" title="Admin area: Manage checker - Roxy-WI">Checker</a></li>
<li><a href="#openvpn" title="Admin area: OpenVPN - HAProxy-WI">OpenVPN</a></li> <li><a href="#openvpn" title="Admin area: OpenVPN - Roxy-WI">OpenVPN</a></li>
<li><a href="#settings" title="Admin area: Manage HAProxy-WI settings - HAProxy-WI">Settings</a></li> <li><a href="#settings" title="Admin area: Manage Roxy-WI settings - Roxy-WI">Settings</a></li>
<li><a href="#services" title="Admin area: Manage HAProxy-WI services - HAProxy-WI">Services</a></li> <li><a href="#services" title="Admin area: Manage Roxy-WI services - Roxy-WI">Services</a></li>
<li><a href="#updatehapwi" title="Admin area: Update HAProxy-WI - HAProxy-WI">Update</a></li> <li><a href="#updatehapwi" title="Admin area: Update Roxy-WI - Roxy-WI">Update</a></li>
<li><a href="#backup" title="Admin area: Backup configs - HAProxy-WI">Backup</a></li> <li><a href="#backup" title="Admin area: Backup configs - Roxy-WI">Backup</a></li>
<li><a href="#installmon" title="Servers: Monitoring service installation - HAProxy-WI">Monitoring installation</a></li> <li><a href="#installmon" title="Servers: Monitoring service installation - Roxy-WI">Monitoring installation</a></li>
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>
<ul id='browse_histroy'></ul> <ul id='browse_histroy'></ul>
@ -63,7 +63,7 @@
</table> </table>
<br /><span class="add-button" title="Add group" id="add-group-button">+ Add</span> <br /><span class="add-button" title="Add group" id="add-group-button">+ Add</span>
<br /><br /> <br /><br />
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;"> <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://haproxy-wi.org/howto.py?howto=setup" title="How to setup servers, group and SSH credentials" target="_blank">article</a>
</div> </div>
</div> </div>
@ -98,8 +98,8 @@
</thead> </thead>
<tbody id="ajax-services-body"></tbody> <tbody id="ajax-services-body"></tbody>
</table> </table>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;"> <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="HAProxy-WI services" target="_blank">here</a> You can read about services <a href="https://haproxy-wi.org/services.py" title="Roxy-WI services" target="_blank">here</a>
</div> </div>
</div> </div>
@ -118,11 +118,11 @@
</thead> </thead>
<tbody id="ajax-updatehapwi-body"></tbody> <tbody id="ajax-updatehapwi-body"></tbody>
</table> </table>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;"> <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> <b style="font-size: 20px; display: block; padding-bottom: 10px;">Note:</b>
For updating you have to use HAProxy-WI RPM. How to start using repository read <a href="https://haproxy-wi.org/installation.py" title="HAProxy-WI installation" target="_blank">here</a> 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>
<br /><br /> <br /><br />
If the HAProxy-WI server uses a proxy to connect to the Internet, add the proxy settings to yum.conf If the Roxy-WI server uses a proxy to connect to the Internet, add the proxy settings to yum.conf
<br /><br /> <br /><br />
Read more about updating in <a href="https://haproxy-wi.org/updates.py" title="Doc" target="_blank">docs</a> 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> and <a href="https://haproxy-wi.org/changelog.py" title="Changelog" target="_blank">changelog</a>

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

@ -36,6 +36,14 @@
</span><div> </span><div>
{% continue %} {% continue %}
{% endif %} {% endif %}
{%- if "stream {" in line -%}
{% if i > 1 %}
</div>
{% endif %}
<span class="param">{{ line }}
</span><div>
{% continue %}
{% endif %}
{% if "listen " in line or "location" in line or "server_name" in line or "}" in line %} {% if "listen " in line or "location" in line or "server_name" in line or "}" in line %}
{% if "#" not in line %} {% if "#" not in line %}
<span class="numRow"> <span class="numRow">

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

@ -80,10 +80,10 @@
</tr> </tr>
</table> </table>
{% else %} {% else %}
<center> <div style="text-align: center;">
<br /> <br />
<h3>You do not have installed OpenVPN client. <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://haproxy-wi.org/services.py?service=openvpn" title="OpenVPN" style="color: #5d9ceb;" target="_blank">hear</a>
how to install OpenVPN client</h3> how to install OpenVPN client</h3>
</center> </div>
{% endif %} {% endif %}

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

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

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

@ -4,7 +4,7 @@
{% set new_ver_without_dots = versions.3 %} {% set new_ver_without_dots = versions.3 %}
<tr> <tr>
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
HAProxy-WI Roxy-WI
</td> </td>
<td> <td>
<b>{{current_ver}}</b> <b>{{current_ver}}</b>
@ -14,7 +14,7 @@
</td> </td>
<td> <td>
{% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %} {% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %}
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('haproxy-wi')" title="Update HAProxy-WI">Update</a> <a class="ui-button ui-widget ui-corner-all" onclick="updateService('haproxy-wi')" title="Update Roxy-WI">Update</a>
{% endif %} {% endif %}
</td> </td>
<td> <td>
@ -91,7 +91,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
{{service_name}} service is not installed {{service_name}} service is not installed
<a href="https://haproxy-wi.org/services.py?service={{service_link}}#installation" title="{{service_name}} installation" target="_blank" style="color: #5d9ceb;">Read about installation</a> <a href="https://haproxy-wi.org/services.py?service={{service_link}}#installation" title="{{service_name}} installation" target="_blank" class="link">Read about installation</a>
{% endif %} {% endif %}
</td> </td>
<td> <td>

2
app/templates/ajax/provisioning/aws_edit_dialog.html
View File

@ -166,7 +166,7 @@
<td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td> <td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td>
<td> <td>
{{checkbox('aws_edit_firewall', checked=checked)}} {{checkbox('aws_edit_firewall', checked=checked)}}
<div class="tooltip tooltipTop tooltipTd">HAProxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div> <div class="tooltip tooltipTop tooltipTd">Roxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div>
</td> </td>
</tr> </tr>
<tr> <tr>

2
app/templates/ajax/provisioning/do_edit_dialog.html
View File

@ -167,7 +167,7 @@
<td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td> <td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td>
<td> <td>
{{checkbox('do_edit_firewall', checked=checked)}} {{checkbox('do_edit_firewall', checked=checked)}}
<div class="tooltip tooltipTop tooltipTd">HAProxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div> <div class="tooltip tooltipTop tooltipTd">Roxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div>
</td> </td>
</tr> </tr>
<tr> <tr>

2
app/templates/ajax/provisioning/gcore_edit_dialog.html
View File

@ -180,7 +180,7 @@
<td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td> <td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td>
<td> <td>
{{checkbox('gcore_edit_firewall', checked=checked)}} {{checkbox('gcore_edit_firewall', checked=checked)}}
<div class="tooltip tooltipTop tooltipTd">HAProxy-WI will edit Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div> <div class="tooltip tooltipTop tooltipTd">Roxy-WI will edit Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div>
</td> </td>
</tr> </tr>
<tr> <tr>

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

@ -1,7 +1,7 @@
<div class="sort_menu"> <div class="sort_menu">
<a href="#" title="Do not sort by status" onclick="showSmon('not_sort')">Do not sort</a> | <a href="#" title="Do not sort by status" onclick="showSmon('not_sort')">Do not sort</a> |
<a href="#" id="sort_by_status" title="Sort by status" onclick="sort_by_status()">Sort by status</a> | <a href="#" id="sort_by_status" title="Sort by status" onclick="sort_by_status()">Sort by status</a> |
<a href="#" title="SMOM Dashboard - HAProxy-WI" onclick="showSmon('refresh');">Refresh</a> <a href="#" title="SMOM Dashboard - Roxy-WI" onclick="showSmon('refresh');">Refresh</a>
<span style="padding-left: 20px;"> <span style="padding-left: 20px;">
{% set down = [] %} {% set down = [] %}
{% set up = [] %} {% set up = [] %}

56
app/templates/base.html
View File

@ -1,6 +1,6 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>{{title}} - HAProxy-WI</title> <title>{{title}} - Roxy-WI</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Pragma" content="no-cache" />
@ -47,7 +47,7 @@
<div class="top-menu"> <div class="top-menu">
<div class="LogoText"> <div class="LogoText">
<span id="logo_text"> <span id="logo_text">
<a href="https://haproxy-wi.org" title="HAProxy-WI site" target="_blank"> <a href="https://haproxy-wi.org" title="Roxy-WI site" target="_blank">
<img src="/inc/images/logo_menu.png" alt="logo" width="170" /> <img src="/inc/images/logo_menu.png" alt="logo" width="170" />
</a> </a>
</span> </span>
@ -62,13 +62,13 @@
<li><a href="/app/hapservers.py" title="HAProxy servers overview" class="overview-link head-submenu">Overview</a> </li> <li><a href="/app/hapservers.py" title="HAProxy servers overview" class="overview-link head-submenu">Overview</a> </li>
<li><a href="/app/config.py" title="Working with HAProxy configs" class="edit head-submenu">Configs</a></li> <li><a href="/app/config.py" title="Working with HAProxy configs" class="edit head-submenu">Configs</a></li>
<li><a href="/app/viewsttats.py" title="HAProxy statistics " class="stats head-submenu">Stats</a></li> <li><a href="/app/viewsttats.py" title="HAProxy statistics " class="stats head-submenu">Stats</a></li>
<li><a href="/app/runtimeapi.py" title="Runtime API - HAProxy-WI" class="runtime head-submenu">Runtime API</a></li> <li><a href="/app/runtimeapi.py" title="Runtime API - Roxy-WI" class="runtime head-submenu">Runtime API</a></li>
<li><a href="/app/metrics.py" title="Metrics" class="metrics head-submenu">Metrics</a></li> <li><a href="/app/metrics.py" title="Metrics" class="metrics head-submenu">Metrics</a></li>
{% if role <= 3 %} {% if role <= 3 %}
<li><a href="/app/add.py#proxy" title="Add proxy: Create proxy - HAProxy-WI" class="add head-submenu" id="add1">Add proxy</a></li> <li><a href="/app/add.py#proxy" title="Add proxy: Create proxy - Roxy-WI" class="add-proxy head-submenu" id="add1">Add proxy</a></li>
<li><a href="/app/versions.py" title="Working with versions HAProxy configs" class="version head-submenu">Versions</a></li> <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 - HAProxy-WI" class="cert head-submenu" id="add3">SSL</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 - HAProxy-WI" class="lists head-submenu" id="add7">Lists</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" title="Web application firewall" class="waf-menu head-submenu">WAF</a> </li>
{% endif %} {% endif %}
</ul> </ul>
@ -82,7 +82,7 @@
<li><a href="/app/viewsttats.py?service=nginx" title="Nginx statistics" class="stats head-submenu">Stats</a></li> <li><a href="/app/viewsttats.py?service=nginx" title="Nginx statistics" class="stats head-submenu">Stats</a></li>
{% if role <= 3 %} {% if role <= 3 %}
<li><a href="/app/versions.py?service=nginx" title="Working with versions Nginx configs" class="version head-submenu">Versions</a></li> <li><a href="/app/versions.py?service=nginx" title="Working with versions Nginx configs" class="version head-submenu">Versions</a></li>
<li><a href="/app/add.py?service=nginx#ssl" title="Add proxy: Upload SSL certificates - HAProxy-WI" class="cert head-submenu" id="add3">SSL</a></li> <li><a href="/app/add.py?service=nginx#ssl" title="Add proxy: Upload SSL certificates - Roxy-WI" class="cert head-submenu" id="add3">SSL</a></li>
{% endif %} {% endif %}
</ul> </ul>
</li> </li>
@ -90,7 +90,7 @@
<li class="p_menu"> <li class="p_menu">
<a title="Keepalived" class="ha">Keepalived</a> <a title="Keepalived" class="ha">Keepalived</a>
<ul class="v_menu"> <ul class="v_menu">
<li><a href="/app/ha.py" title="Create and configure HA cluster - HAProxy-WI" class="keepalived head-submenu">HA</a></li> <li><a href="/app/ha.py" title="Create and configure HA cluster - Roxy-WI" class="keepalived head-submenu">HA</a></li>
<li><a href="/app/config.py?service=keepalived" title="Working with Keepalived configs" class="edit head-submenu">Configs</a></li> <li><a href="/app/config.py?service=keepalived" title="Working with Keepalived configs" class="edit head-submenu">Configs</a></li>
<li><a href="/app/versions.py?service=keepalived" title="Working with versions Keepalived configs" class="version head-submenu keepalived_versions">Versions</a></li> <li><a href="/app/versions.py?service=keepalived" title="Working with versions Keepalived configs" class="version head-submenu keepalived_versions">Versions</a></li>
</ul> </ul>
@ -113,15 +113,15 @@
<li class="p_menu"> <li class="p_menu">
<a title="Servers manage" class="runtime">Servers</a> <a title="Servers manage" class="runtime">Servers</a>
<ul class="v_menu"> <ul class="v_menu">
<li><a href="/app/servers.py#users" title="Servers: Manage users - HAProxy-WI" class="users head-submenu">Users</a></li> <li><a href="/app/servers.py#users" title="Servers: Manage users - Roxy-WI" class="users head-submenu">Users</a></li>
<li><a href="/app/servers.py#servers" title="Servers: Manage servers - HAProxy-WI" class="runtime head-submenu">Servers</a></li> <li><a href="/app/servers.py#servers" title="Servers: Manage servers - Roxy-WI" class="runtime head-submenu">Servers</a></li>
<li><a href="/app/servers.py#ssh" title="Servers: Manage SSH credentials - HAProxy-WI" class="admin head-submenu">SSH credentials</a></li> <li><a href="/app/servers.py#ssh" title="Servers: Manage SSH credentials - Roxy-WI" class="admin head-submenu">SSH credentials</a></li>
<li><a href="/app/servers.py#settings" title="Servers: Manage HAProxy-WI settings - HAProxy-WI" class="settings head-submenu">Settings</a></li> <li><a href="/app/servers.py#settings" title="Servers: Manage Roxy-WI settings - Roxy-WI" class="settings head-submenu">Settings</a></li>
<li><a href="/app/servers.py#installproxy" title="Servers: Proxy service installation - HAProxy-WI" class="hap-menu head-submenu">Proxy installation</a> </li> <li><a href="/app/servers.py#installproxy" title="Servers: Proxy service installation - Roxy-WI" class="hap-menu head-submenu">Proxy installation</a> </li>
<li><a href="/app/servers.py#installmon" title="Servers: Monitoring service installation - HAProxy-WI" class="hap1 head-submenu">Monitoring installation</a> </li> <li><a href="/app/servers.py#installmon" title="Servers: Monitoring service installation - Roxy-WI" class="hap1 head-submenu">Monitoring installation</a> </li>
<li><a href="/app/provisioning.py" title="Servers: Provisioning - HAProxy-WI" class="hap1 head-submenu">Server provisioning</a> </li> <li><a href="/app/provisioning.py" title="Servers: Provisioning - Roxy-WI" class="hap1 head-submenu">Server provisioning</a> </li>
<li><a href="/app/viewlogs.py?type=2" title="Servers: View internal logs - HAProxy-WI" class="logs head-submenu">Internal logs</a></li> <li><a href="/app/viewlogs.py?type=2" title="Servers: View internal logs - Roxy-WI" class="logs head-submenu">Internal logs</a></li>
<li><a href="/app/servers.py#backup" title="Servers: Backup configs - HAProxy-WI" class="backup head-submenu">Backups</a> </li> <li><a href="/app/servers.py#backup" title="Servers: Backup configs - Roxy-WI" class="backup head-submenu">Backups</a> </li>
</ul> </ul>
</li> </li>
{% endif %} {% endif %}
@ -129,14 +129,14 @@
<li class="p_menu"> <li class="p_menu">
<a title="Admin area" class="admin">Admin area</a> <a title="Admin area" class="admin">Admin area</a>
<ul class="v_menu"> <ul class="v_menu">
<li><a href="/app/users.py#users" title="Admin area: Manage users - HAProxy-WI" class="users head-submenu">Users</a></li> <li><a href="/app/users.py#users" title="Admin area: Manage users - Roxy-WI" class="users head-submenu">Users</a></li>
<li><a href="/app/users.py#groups" title="Admin area: Manage groups - HAProxy-WI" class="group head-submenu">Groups</a></li> <li><a href="/app/users.py#groups" title="Admin area: Manage groups - Roxy-WI" class="group head-submenu">Groups</a></li>
<li><a href="/app/users.py#servers" title="Admin area: Manage servers - HAProxy-WI" class="runtime head-submenu">Servers</a></li> <li><a href="/app/users.py#servers" title="Admin area: Manage servers - Roxy-WI" class="runtime head-submenu">Servers</a></li>
<li><a href="/app/users.py#ssh" title="Admin area: Manage SSH credentials - HAProxy-WI" class="admin head-submenu">SSH credentials</a></li> <li><a href="/app/users.py#ssh" title="Admin area: Manage SSH credentials - Roxy-WI" class="admin head-submenu">SSH credentials</a></li>
<li><a href="/app/users.py#settings" title="Admin area: Manage HAProxy-WI settings - HAProxy-WI" class="settings head-submenu">Settings</a></li> <li><a href="/app/users.py#settings" title="Admin area: Manage Roxy-WI settings - Roxy-WI" class="settings head-submenu">Settings</a></li>
<li><a href="/app/users.py#services" title="Admin area: Manage HAProxy-WI services - HAProxy-WI" class="services head-submenu">Services</a></li> <li><a href="/app/users.py#services" title="Admin area: Manage Roxy-WI services - Roxy-WI" class="services head-submenu">Services</a></li>
<li><a href="/app/viewlogs.py" title="Admin area: View internal logs - HAProxy-WI" class="logs head-submenu">Internal logs</a></li> <li><a href="/app/viewlogs.py" title="Admin area: View internal logs - Roxy-WI" class="logs head-submenu">Internal logs</a></li>
<li><a href="/app/users.py#updatehapwi" title="Admin area: Update HAProxy-WI - HAProxy-WI" class="upload updatehapwi head-submenu">Update</a></li> <li><a href="/app/users.py#updatehapwi" title="Admin area: Update Roxy-WI - Roxy-WI" class="upload updatehapwi head-submenu">Update</a></li>
</ul> </ul>
</li> </li>
{% endif %} {% endif %}
@ -217,7 +217,7 @@
</div> </div>
<div id="show-updates" style="display: none;"> <div id="show-updates" style="display: none;">
<div> <div>
There is a new version HAProxy-WI. Check the <a href="/app/users.py#updatehapwi" class="link">Update page</a> There is a new version Roxy-WI. Check the <a href="/app/users.py#updatehapwi" class="link">Update page</a>
</div> </div>
</div> </div>
<div class="footer"> <div class="footer">
@ -235,12 +235,12 @@
</div> </div>
<div id="version"></div> <div id="version"></div>
<div id="logo_footer"> <div id="logo_footer">
<a href="https://haproxy-wi.org" title="HAProxy-WI official site" target="_blank"> <a href="https://haproxy-wi.org" title="Roxy-WI official site" target="_blank">
<img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" /> <img src="/inc/images/logo_footer.png" alt="logo" id="logo_footer_img" />
</a> </a>
</div> </div>
<div class="footer-div"> <div class="footer-div">
<a href="https://haproxy-wi.org" class="footer-link" target="_blank" title="About HAProxy-WI">About</a> <a href="https://haproxy-wi.org" class="footer-link" target="_blank" title="About Roxy-WI">About</a>
<a href="https://github.com/hap-wi/haproxy-wi/issues" class="footer-link" target="_blank" title="Community help">Help</a> <a href="https://github.com/hap-wi/haproxy-wi/issues" class="footer-link" target="_blank" title="Community help">Help</a>
<a href="https://sd.haproxy-wi.org" class="footer-link" target="_blank" title="Service Desk">SD</a> <a href="https://sd.haproxy-wi.org" class="footer-link" target="_blank" title="Service Desk">SD</a>
<a href="https://haproxy-wi.org/contacts.py" class="footer-link" target="_blank">Contacts</a> <a href="https://haproxy-wi.org/contacts.py" class="footer-link" target="_blank">Contacts</a>

6
app/templates/ha.html
View File

@ -14,8 +14,8 @@
<td>Slave</td> <td>Slave</td>
<td><span title="Interface for VRRP address">Interface(?)</span></td> <td><span title="Interface for VRRP address">Interface(?)</span></td>
<td>VRRP IP</td> <td>VRRP IP</td>
<td><span title="HAProxy-WI will try to install HAProxy">HAProxy(?)</span></td> <td><span title="Roxy-WI will try to install HAProxy">HAProxy(?)</span></td>
<td><span title="HAProxy-WI will try to install Nginx">Nginx(?)</span></td> <td><span title="Roxy-WI will try to install Nginx">Nginx(?)</span></td>
<td>SYN flood protect</td> <td>SYN flood protect</td>
<td></td> <td></td>
</tr> </tr>
@ -54,7 +54,7 @@
<td>Slave</td> <td>Slave</td>
<td><span title="Interface for VRRP address">Interface(?)</span></td> <td><span title="Interface for VRRP address">Interface(?)</span></td>
<td>VRRP IP</td> <td>VRRP IP</td>
<td><span title="If checked HAProxy-WI will restart Keepalived">Restart(?)</span></td> <td><span title="If checked Roxy-WI will restart Keepalived">Restart(?)</span></td>
<td style="width: 23%;"></td> <td style="width: 23%;"></td>
<td></td> <td></td>
<td></td> <td></td>

8
app/templates/hapservers.html
View File

@ -83,6 +83,7 @@
{% if service == 'haproxy' %} {% if service == 'haproxy' %}
{% for s in servers %} {% for s in servers %}
getChartData(server_ip) getChartData(server_ip)
getHttpChartData(server_ip)
getWafChartData(server_ip) getWafChartData(server_ip)
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -101,6 +102,7 @@
(resolve, reject) => { (resolve, reject) => {
{% for s in servers %} {% for s in servers %}
getChartData(server_ip) getChartData(server_ip)
getHttpChartData(server_ip)
getWafChartData(server_ip) getWafChartData(server_ip)
{% endfor %} {% endfor %}
}); });
@ -159,6 +161,9 @@
{% endif %} {% endif %}
</span> </span>
{% endif %} {% endif %}
{% if s.8.0.20 == 1 %}
<span class="lock" title="This server is inaccessible for editing by everyone except the admin role"></span>
{% endif %}
{% if role <= 2 %} {% if role <= 2 %}
<span class="server-action"> <span class="server-action">
{% if service == 'nginx' %} {% if service == 'nginx' %}
@ -280,6 +285,9 @@
<div id="server_metrics_div" class="chart-container" style="display: block; width: 91.3%; height: 300px;"> <div id="server_metrics_div" class="chart-container" style="display: block; width: 91.3%; height: 300px;">
<canvas id="{{s.2}}" role="img"></canvas> <canvas id="{{s.2}}" role="img"></canvas>
</div> </div>
<div id="http_metrics_div" class="chart-container" style="display: block; width: 91.3%; height: 300px;">
<canvas id="http_{{s.2}}" role="img"></canvas>
</div>
<div id="waf_metrics_div" class="chart-container" style="display: block; width: 90%; height: 300px;"> <div id="waf_metrics_div" class="chart-container" style="display: block; width: 90%; height: 300px;">
<canvas id="s_{{s.2}}" role="img"></canvas> <canvas id="s_{{s.2}}" role="img"></canvas>
</div> </div>

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

@ -85,7 +85,7 @@
</tr> </tr>
</table> </table>
<div id="ajax-ssh"></div> <div id="ajax-ssh"></div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;"> <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> 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> 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>
</div> </div>

0
app/templates/include/geoip_select.html Normal file
View File

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

@ -17,7 +17,7 @@
{% endif %} {% endif %}
</td> </td>
<td class="padding10 first-collumn" style="width: 20%;"> <td class="padding10 first-collumn" style="width: 20%;">
HAProxy-WI will try to install the latest Grafana and Prometheus servers versions Roxy-WI will try to install the latest Grafana and Prometheus servers versions
</td> </td>
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
Before installing any exporters, first install Grafana and Prometheus servers Before installing any exporters, first install Grafana and Prometheus servers
@ -44,7 +44,7 @@
<td id="cur_haproxy_exp_ver" class="padding10 first-collumn"> <td id="cur_haproxy_exp_ver" class="padding10 first-collumn">
</td> </td>
<td class="padding10 first-collumn" style="width: 20%;"> <td class="padding10 first-collumn" style="width: 20%;">
HAProxy-WI will try to install the latest HAProxy Exporter version Roxy-WI will try to install the latest HAProxy Exporter version
</td> </td>
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="haproxy_exp_addserv" id="haproxy_exp_addserv"> <select autofocus required name="haproxy_exp_addserv" id="haproxy_exp_addserv">
@ -74,7 +74,7 @@
<td id="cur_nginx_exp_ver" class="padding10 first-collumn"> <td id="cur_nginx_exp_ver" class="padding10 first-collumn">
</td> </td>
<td class="padding10 first-collumn" style="width: 20%;"> <td class="padding10 first-collumn" style="width: 20%;">
HAProxy-WI will try to install the latest Nginx Exporter version Roxy-WI will try to install the latest Nginx Exporter version
</td> </td>
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="nginx_exp_addserv" id="nginx_exp_addserv"> <select autofocus required name="nginx_exp_addserv" id="nginx_exp_addserv">
@ -104,7 +104,7 @@
<td id="cur_node_exp_ver" class="padding10 first-collumn"> <td id="cur_node_exp_ver" class="padding10 first-collumn">
</td> </td>
<td class="padding10 first-collumn" style="width: 20%;"> <td class="padding10 first-collumn" style="width: 20%;">
HAProxy-WI will try to install the latest Node Exporter version Roxy-WI will try to install the latest Node Exporter version
</td> </td>
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="node_exp_addserv" id="node_exp_addserv"> <select autofocus required name="node_exp_addserv" id="node_exp_addserv">

6
app/templates/include/provisioning/creating_dialogs.html
View File

@ -175,7 +175,7 @@
<td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td> <td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td>
<td> <td>
{{checkbox('do_create_firewall', checked='checked')}} {{checkbox('do_create_firewall', checked='checked')}}
<div class="tooltip tooltipTop tooltipTd">HAProxy-WI will create firewall and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be opened</div> <div class="tooltip tooltipTop tooltipTd">Roxy-WI will create firewall and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be opened</div>
</td> </td>
</tr> </tr>
</table> </table>
@ -325,7 +325,7 @@
<td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td> <td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td>
<td> <td>
{{checkbox('aws_create_firewall', checked='checked')}} {{checkbox('aws_create_firewall', checked='checked')}}
<div class="tooltip tooltipTop tooltipTd">HAProxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div> <div class="tooltip tooltipTop tooltipTd">Roxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise all ports will be closed</div>
</td> </td>
</tr> </tr>
</table> </table>
@ -519,7 +519,7 @@
<td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td> <td class="padding20" style="padding-bottom: 25px;padding-top: 25px;">Firewall</td>
<td> <td>
{{checkbox('gcore_create_firewall', checked='checked')}} {{checkbox('gcore_create_firewall', checked='checked')}}
<div class="tooltip tooltipTop tooltipTd">HAProxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise will be used the default SG</div> <div class="tooltip tooltipTop tooltipTd">Roxy-WI will create Security group and open 22, 443, 1999, 8085, 8086 ports. Otherwise will be used the default SG</div>
</td> </td>
</tr> </tr>
</table> </table>

6
app/templates/nettools.html
View File

@ -32,7 +32,7 @@
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="nettools_icmp_server_from" id="nettools_icmp_server_from"> <select autofocus required name="nettools_icmp_server_from" id="nettools_icmp_server_from">
<option disabled selected>Choose server</option> <option disabled selected>Choose server</option>
<option value="localhost">HAProxy-WI</option> <option value="localhost">Roxy-WI</option>
{% for server in servers %} {% for server in servers %}
<option value="{{ server.2 }}">{{ server.1 }}</option> <option value="{{ server.2 }}">{{ server.1 }}</option>
{% endfor %} {% endfor %}
@ -64,7 +64,7 @@
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="nettools_telnet_server_from" id="nettools_telnet_server_from"> <select autofocus required name="nettools_telnet_server_from" id="nettools_telnet_server_from">
<option disabled selected>Choose server</option> <option disabled selected>Choose server</option>
<option value="localhost">HAProxy-WI</option> <option value="localhost">Roxy-WI</option>
{% for server in servers %} {% for server in servers %}
<option value="{{ server.2 }}">{{ server.1 }}</option> <option value="{{ server.2 }}">{{ server.1 }}</option>
{% endfor %} {% endfor %}
@ -96,7 +96,7 @@
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="nettools_nslookup_server_from" id="nettools_nslookup_server_from"> <select autofocus required name="nettools_nslookup_server_from" id="nettools_nslookup_server_from">
<option disabled selected>Choose server</option> <option disabled selected>Choose server</option>
<option value="localhost">HAProxy-WI</option> <option value="localhost">Roxy-WI</option>
{% for server in servers %} {% for server in servers %}
<option value="{{ server.2 }}">{{ server.1 }}</option> <option value="{{ server.2 }}">{{ server.1 }}</option>
{% endfor %} {% endfor %}

22
app/templates/ovw.html
View File

@ -59,11 +59,11 @@
<tr class="overviewHead" style="height: 40px;"> <tr class="overviewHead" style="height: 40px;">
<td class="padding10 first-collumn-wi" colspan="2"> <td class="padding10 first-collumn-wi" colspan="2">
{% if role <= 1 %} {% if role <= 1 %}
<a href="/app/viewlogs.py?viewlogs={{haproxy_wi_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View HAProxy-WI logs" class="logs_link"> <a href="/app/viewlogs.py?viewlogs={{haproxy_wi_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View Roxy-WI logs" class="logs_link">
HAProxy-WI server status Roxy-WI server status
</a> </a>
{% else %} {% else %}
HAProxy-WI server status Roxy-WI server status
{% endif %} {% endif %}
</td> </td>
<td> <td>
@ -110,7 +110,7 @@
{% if metrics_master == 'inactive' or metrics_master == 'failed' %} {% if metrics_master == 'inactive' or metrics_master == 'failed' %}
<span class="serverDown server-status" title="Metrics is stopped"></span> <span class="serverDown server-status" title="Metrics is stopped"></span>
{% if role <= 1 %} {% if role <= 1 %}
<a href="/app/users.py#services" title="Start Metrics - HAProxy-WI service" class="logs_link"> <a href="/app/users.py#services" title="Start Metrics - Roxy-WI service" class="logs_link">
Metrics master Metrics master
</a> </a>
{% else %} {% else %}
@ -138,7 +138,7 @@
{% if checker_master == 'inactive' or checker_master == 'failed' %} {% if checker_master == 'inactive' or checker_master == 'failed' %}
<span class="serverDown server-status" title="Checker is stopped"></span> <span class="serverDown server-status" title="Checker is stopped"></span>
{% if role <= 1 %} {% if role <= 1 %}
<a href="/app/users.py#services" title="Start Checker - HAProxy-WI service" class="logs_link"> <a href="/app/users.py#services" title="Start Checker - Roxy-WI service" class="logs_link">
Checker master Checker master
</a> </a>
{% else %} {% else %}
@ -166,7 +166,7 @@
{% if keep_alive == 'inactive' or keep_alive == 'failed' %} {% if keep_alive == 'inactive' or keep_alive == 'failed' %}
<span class="serverDown server-status" title="Auto start is stopped"></span> <span class="serverDown server-status" title="Auto start is stopped"></span>
{% if role <= 1 %} {% if role <= 1 %}
<a href="/app/users.py#services" title="Start Auto star - HAProxy-WI service" class="logs_link"> <a href="/app/users.py#services" title="Start Auto star - Roxy-WI service" class="logs_link">
Auto start Auto start
</a> </a>
{% else %} {% else %}
@ -227,7 +227,7 @@
{% else %} {% else %}
{% if smon == 'inactive' or smon== 'failed' %} {% if smon == 'inactive' or smon== 'failed' %}
<span class="serverDown server-status" title="SMON is stopped"></span> <span class="serverDown server-status" title="SMON is stopped"></span>
<a href="/app/users.py#services" title="Start SMON - HAProxy-WI service" class="logs_link"> <a href="/app/users.py#services" title="Start SMON - Roxy-WI service" class="logs_link">
SMON SMON
</a> </a>
{% else %} {% else %}
@ -268,7 +268,7 @@
{% else %} {% else %}
{% if port_scanner == 'inactive' or port_scanner== 'failed' %} {% if port_scanner == 'inactive' or port_scanner== 'failed' %}
<span class="serverDown server-status" title="Port scanner is stopped"></span> <span class="serverDown server-status" title="Port scanner is stopped"></span>
<a href="/app/users.py#services" title="Start Port scanner - HAProxy-WI service" class="logs_link"> <a href="/app/users.py#services" title="Start Port scanner - Roxy-WI service" class="logs_link">
Port scanner Port scanner
</a> </a>
{% else %} {% else %}
@ -401,11 +401,11 @@
<tr class="overviewHead"> <tr class="overviewHead">
<td class="padding10 first-collumn-wi"> <td class="padding10 first-collumn-wi">
{% if role == 2 %} {% if role == 2 %}
<a href="/app/viewlogs.py?type=2&viewlogs={{haproxy_wi_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View HAProxy-WI logs" class="logs_link"> <a href="/app/viewlogs.py?type=2&viewlogs={{haproxy_wi_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View Roxy-WI logs" class="logs_link">
{% else %} {% else %}
<a href="/app/viewlogs.py?viewlogs={{haproxy_wi_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View HAProxy-WI logs" class="logs_link"> <a href="/app/viewlogs.py?viewlogs={{haproxy_wi_log_id}}&rows=10&grep=&hour=00&minut=00&hour1=24&minut1=00" title="View Roxy-WI logs" class="logs_link">
{% endif %} {% endif %}
Recent HAProxy-WI log Recent Roxy-WI log
</a> </a>
</td> </td>
<td> <td>

4
app/templates/provisioning.html
View File

@ -7,8 +7,8 @@
{% include 'include/del_confirm.html' %} {% include 'include/del_confirm.html' %}
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#provisioning" title="Server provisioning - HAProxy-WI">Provisioning</a></li> <li><a href="#provisioning" title="Server provisioning - Roxy-WI">Provisioning</a></li>
<li><a href="#providers" title="Providers settings - HAProxy-WI">Providers</a></li> <li><a href="#providers" title="Providers settings - Roxy-WI">Providers</a></li>
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>
<ul id='browse_histroy'></ul> <ul id='browse_histroy'></ul>

12
app/templates/runtimeapi.html
View File

@ -6,13 +6,13 @@
<script type="text/javascript" charset="utf8" src="/inc/runtimeapi.js"></script> <script type="text/javascript" charset="utf8" src="/inc/runtimeapi.js"></script>
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#runtimeapi" title="Runtime API - HAProxy-WI">Runtime API</a></li> <li><a href="#runtimeapi" title="Runtime API - Roxy-WI">Runtime API</a></li>
{% if role <= 3 %} {% if role <= 3 %}
<li><a href="#maxconn" title="Runtime API: Changing Maxconn - HAProxy-WI">Change Maxconn</a></li> <li><a href="#maxconn" title="Runtime API: Changing Maxconn - Roxy-WI">Change Maxconn</a></li>
<li><a href="#ip" title="Runtime API: Changing IP and Port for backend servers - HAProxy-WI">Change IP and Port</a></li> <li><a href="#ip" title="Runtime API: Changing IP and Port for backend servers - Roxy-WI">Change IP and Port</a></li>
<li><a href="#table" title="Runtime API: Stick Table - HAProxy-WI">Stick Table</a></li> <li><a href="#table" title="Runtime API: Stick Table - Roxy-WI">Stick Table</a></li>
<li><a href="#lists" title="Runtime API: Change dynamically whitelist and blacklist - HAProxy-WI">Lists</a></li> <li><a href="#lists" title="Runtime API: Change dynamically whitelist and blacklist - Roxy-WI">Lists</a></li>
<li><a href="#sessions" title="Runtime API: Sessions - HAProxy-WI">Sessions</a></li> <li><a href="#sessions" title="Runtime API: Sessions - Roxy-WI">Sessions</a></li>
{% endif %} {% endif %}
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>

22
app/templates/servers.html
View File

@ -9,15 +9,15 @@
{{ input('new-telegram-group-add', type='hidden', value=group) }} {{ input('new-telegram-group-add', type='hidden', value=group) }}
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#users" title="Servers: Manage users - HAProxy-WI">Users</a></li> <li><a href="#users" title="Servers: Manage users - Roxy-WI">Users</a></li>
<li><a href="#servers" title="Servers: Manage servers - HAProxy-WI">Servers</a></li> <li><a href="#servers" title="Servers: Manage servers - Roxy-WI">Servers</a></li>
<li><a href="#ssh" title="Servers: Manage SSH credentials - HAProxy-WI">SSH credentials</a></li> <li><a href="#ssh" title="Servers: Manage SSH credentials - Roxy-WI">SSH credentials</a></li>
<li><a href="#checker" title="Servers: Manage checker - HAProxy-WI">Checker</a></li> <li><a href="#checker" title="Servers: Manage checker - Roxy-WI">Checker</a></li>
<li><a href="#settings" title="Admin area: Manage HAProxy-WI settings - HAProxy-WI">Settings</a></li> <li><a href="#settings" title="Admin area: Manage Roxy-WI settings - Roxy-WI">Settings</a></li>
<li><a href="#installproxy" title="Servers: Proxy service installation - HAProxy-WI">Proxy installation</a></li> <li><a href="#installproxy" title="Servers: Proxy service installation - Roxy-WI">Proxy installation</a></li>
<li><a href="#installmon" title="Servers: Monitoring service installation - HAProxy-WI">Monitoring installation</a></li> <li><a href="#installmon" title="Servers: Monitoring service installation - Roxy-WI">Monitoring installation</a></li>
<li><a href="#geolite2" title="Servers: GeoLite2 - HAProxy-WI">GeoLite2</a></li> <li><a href="#geolite2" title="Servers: GeoLite2 - Roxy-WI">GeoLite2</a></li>
<li><a href="#backup" title="Servers: Backup configs - HAProxy-WI">Backup</a></li> <li><a href="#backup" title="Servers: Backup configs - Roxy-WI">Backup</a></li>
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>
<ul id='browse_histroy'></ul> <ul id='browse_histroy'></ul>
@ -89,7 +89,7 @@
<td id="cur_nginx_ver" class="padding10 first-collumn"> <td id="cur_nginx_ver" class="padding10 first-collumn">
</td> </td>
<td class="padding10 first-collumn" style="width: 20%;"> <td class="padding10 first-collumn" style="width: 20%;">
HAProxy-WI will try to install the latest Nginx version from official Nginx repository Roxy-WI will try to install the latest Nginx version from official Nginx repository
</td> </td>
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="nginxaddserv" id="nginxaddserv"> <select autofocus required name="nginxaddserv" id="nginxaddserv">
@ -120,7 +120,7 @@
<tr class="overviewHead"> <tr class="overviewHead">
<td class="padding10 first-collumn">Server</td> <td class="padding10 first-collumn">Server</td>
<td class="padding10 first-collumn" style="width: 30%;">Current installation</td> <td class="padding10 first-collumn" style="width: 30%;">Current installation</td>
<td class="" style="width: 30%;" title="GeoLite2 DB is released every Tuesday. Should HAProxy-WI update it?">Updating</td> <td class="" style="width: 30%;" title="GeoLite2 DB is released every Tuesday. Should Roxy-WI update it?">Updating</td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>

6
app/templates/smon.html
View File

@ -13,19 +13,19 @@
{% elif smon_status.0 == 'failed' %} {% elif smon_status.0 == 'failed' %}
<center> <center>
<br /> <br />
<h3>SMON service is not run. Run the SMON service <a href="users.py#services" title="HAProxy-WI services" target="_blank">here</a> before use</h3> <h3>SMON service is not run. Run the SMON service <a href="users.py#services" title="Roxy-WI services" target="_blank">here</a> before use</h3>
</center> </center>
{% elif smon|length == 0 and action != 'add' and action != 'history' and action != 'checker_history' %} {% elif smon|length == 0 and action != 'add' and action != 'history' and action != 'checker_history' %}
<center> <center>
<br /> <br />
<h3>You do not have added servers in SMON service. Create you first server <a href="smon.py?action=add" title="HAProxy-WI SMON" target="_blank">here</a> before use</h3> <h3>You do not have added servers in SMON service. Create you first server <a href="smon.py?action=add" title="Roxy-WI SMON" target="_blank">here</a> before use</h3>
<br /> <br />
<iframe width="860" height="515" src="https://www.youtube.com/embed/bJtRJeHG5B0" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe> <iframe width="860" height="515" src="https://www.youtube.com/embed/bJtRJeHG5B0" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</center> </center>
{% elif smon|length == 0 and action != 'add' and action == 'history' %} {% elif smon|length == 0 and action != 'add' and action == 'history' %}
<center> <center>
<br /> <br />
<h3>There are not any events yet. Check if there are any checks added <a href="smon.py?action=add" title="HAProxy-WI SMON" target="_blank">here</a></h3> <h3>There are not any events yet. Check if there are any checks added <a href="smon.py?action=add" title="Roxy-WI SMON" target="_blank">here</a></h3>
<br /> <br />
</center> </center>
{% elif smon|length == 0 and action != 'add' and action == 'checker_history' %} {% elif smon|length == 0 and action != 'add' and action == 'checker_history' %}

2
app/templates/viewstats.html
View File

@ -128,7 +128,7 @@
} }
} }
} }
{% if role == 3 %} {% if role == 4 %}
$('input[type=checkbox]').remove() $('input[type=checkbox]').remove()
{% endif %} {% endif %}
await sleep(2000); await sleep(2000);

15
inc/awesome.css
View File

@ -66,6 +66,14 @@
content: "\f0c5"; content: "\f0c5";
} }
.add::before { .add::before {
display: none;
font-family: "Font Awesome 5 Solid";
content: "\f24d";
}
.add .fa-clone {
color: var(--green-color);
}
.add-proxy::before {
display: none; display: none;
font-family: "Font Awesome 5 Solid"; font-family: "Font Awesome 5 Solid";
content: "\f067"; content: "\f067";
@ -143,7 +151,10 @@
.delete::before, .deleteVer::before { .delete::before, .deleteVer::before {
display: none; display: none;
font-family: "Font Awesome 5 Solid"; font-family: "Font Awesome 5 Solid";
content: "\f00d"; content: "\f2ed";
}
.delete .fa-trash-alt {
color: var(--red-color) !important;
} }
.info::before { .info::before {
display: none; display: none;
@ -232,7 +243,7 @@
} }
.fa-play, .fa-stop, .fa-sync-alt { .fa-play, .fa-stop, .fa-sync-alt {
width: 3px; width: 3px;
color: #a0d100 !important; color: var(--green-color) !important;
cursor: pointer; cursor: pointer;
margin-bottom: 3px; margin-bottom: 3px;
} }

2
inc/script.js
View File

@ -636,7 +636,7 @@ $( function() {
autoOpen: false, autoOpen: false,
width: 600, width: 600,
modal: true, modal: true,
title: 'There is a new version HAProxy-WI', title: 'There is a new version Roxy-WI',
buttons: { buttons: {
Close: function() { Close: function() {
$( this ).dialog( "close" ); $( this ).dialog( "close" );

4
inc/style.css
View File

@ -1,5 +1,5 @@
:root { :root {
--green-color: #5ad05a; --green-color: #5CB85C;
--red-color: #be2424; --red-color: #be2424;
--blue-color: #5d9ceb; --blue-color: #5d9ceb;
--link-dark-blue: #23527c; --link-dark-blue: #23527c;
@ -402,7 +402,7 @@ pre {
background-color: #ddd; background-color: #ddd;
} }
.add-button, .add-button-wi { .add-button, .add-button-wi {
background-color: #5CB85C; background-color: var(--green-color);
border-radius: 5px; border-radius: 5px;
color: #fff; color: #fff;
padding: 5px 10px; padding: 5px 10px;

31
inc/users.js
View File

@ -670,6 +670,13 @@ $( function() {
var id = $(this).attr('id').split('-'); var id = $(this).attr('id').split('-');
updateBackup(id[2]) updateBackup(id[2])
}); });
$( "#scan_server" ).change(function() {
if ($('#scan_server').is(':checked')) {
$('.services_for_scan').hide();
} else {
$('.services_for_scan').show();
}
});
$('#search_ldap_user').click(function() { $('#search_ldap_user').click(function() {
var valid = true; var valid = true;
toastr.clear(); toastr.clear();
@ -948,11 +955,15 @@ function addServer(dialog_id) {
var newip = $('#new-ip').val(); var newip = $('#new-ip').val();
var newservergroup = $('#new-server-group-add').val(); var newservergroup = $('#new-server-group-add').val();
var cred = $('#credentials').val(); var cred = $('#credentials').val();
var scan_server = 0;
var typeip = 0; var typeip = 0;
var enable = 0; var enable = 0;
var haproxy = 0; var haproxy = 0;
var nginx = 0; var nginx = 0;
var firewall = 0; var firewall = 0;
if ($('#scan_server').is(':checked')) {
scan_server = '1';
}
if ($('#typeip').is(':checked')) { if ($('#typeip').is(':checked')) {
typeip = '1'; typeip = '1';
} }
@ -973,6 +984,15 @@ function addServer(dialog_id) {
valid = valid && checkLength( $('#new-server-add'), "Hostname", 1 ); valid = valid && checkLength( $('#new-server-add'), "Hostname", 1 );
valid = valid && checkLength( $('#new-ip'), "IP", 1 ); valid = valid && checkLength( $('#new-ip'), "IP", 1 );
valid = valid && checkLength( $('#new-port'), "Port", 1 ); valid = valid && checkLength( $('#new-port'), "Port", 1 );
console.log(cred)
if (cred == null) {
toastr.error('First select credentials');
return false;
}
if (newservergroup == null) {
toastr.error('First select a group');
return false;
}
if (valid) { if (valid) {
$.ajax( { $.ajax( {
url: "options.py", url: "options.py",
@ -982,6 +1002,7 @@ function addServer(dialog_id) {
newip: newip, newip: newip,
newport: $('#new-port').val(), newport: $('#new-port').val(),
newservergroup: newservergroup, newservergroup: newservergroup,
scan_server: scan_server,
typeip: typeip, typeip: typeip,
haproxy: haproxy, haproxy: haproxy,
nginx: nginx, nginx: nginx,
@ -2165,22 +2186,22 @@ function updateService(service) {
toastr.success('Update was success!'); toastr.success('Update was success!');
} else if (data.indexOf('Unauthorized') != '-1') { } else if (data.indexOf('Unauthorized') != '-1') {
toastr.clear(); toastr.clear();
toastr.error('It seems like Unauthorized in the HAProxy-WI repository. How to get HAProxy-WI auth you can read <b><a href="https://haproxy-wi.org/installation.py" title="How to get HAProxy-WI auth">hear</a></b>'); toastr.error('It seems like Unauthorized in the Roxy-WI repository. How to get Roxy-WI auth you can read <b><a href="https://haproxy-wi.org/installation.py" title="How to get Roxy-WI auth">hear</a></b>');
} else if (data.indexOf('but not installed') != '-1') { } else if (data.indexOf('but not installed') != '-1') {
toastr.clear(); toastr.clear();
toastr.error('There is settings for HAProxy-WI repository, but HAProxy-WI is installed without repository. Please reinstall with yum'); toastr.error('There is settings for Roxy-WI repository, but Roxy-WI is installed without repository. Please reinstall with yum');
} else if (data.indexOf('No Match for argument') != '-1') { } else if (data.indexOf('No Match for argument') != '-1') {
toastr.clear(); toastr.clear();
toastr.error('It seems like HAProxy-WI repository is not set. Please read docs for <b><a href="https://haproxy-wi.org/updates.py">detail</a></b>'); toastr.error('It seems like Roxy-WI repository is not set. Please read docs for <b><a href="https://haproxy-wi.org/updates.py">detail</a></b>');
} else if (data.indexOf('password for') != '-1') { } else if (data.indexOf('password for') != '-1') {
toastr.clear(); toastr.clear();
toastr.error('It seems like apache user needs to be add to sudoers. Please read docs for <b><a href="https://haproxy-wi.org/updates.py">detail</a></b>'); toastr.error('It seems like apache user needs to be add to sudoers. Please read docs for <b><a href="https://haproxy-wi.org/updates.py">detail</a></b>');
} else if (data.indexOf('No packages marked for update') != '-1') { } else if (data.indexOf('No packages marked for update') != '-1') {
toastr.clear(); toastr.clear();
toastr.info('It seems like the lastest version HAProxy-WI is installed'); toastr.info('It seems like the lastest version Roxy-WI is installed');
} else if (data.indexOf('Connection timed out') != '-1') { } else if (data.indexOf('Connection timed out') != '-1') {
toastr.clear(); toastr.clear();
toastr.error('Cannot connect to HAProxy-WI repository. Connection timed out'); toastr.error('Cannot connect to Roxy-WI repository. Connection timed out');
} else if (data.indexOf('--disable') != '-1') { } else if (data.indexOf('--disable') != '-1') {
toastr.clear(); toastr.clear();
toastr.error('It seems like there is a problem with repositories'); toastr.error('It seems like there is a problem with repositories');