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

v5.2.4.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2_4
pull/304/head
Pavel Loginov 2021-08-18 14:38:15 +06:00
parent 1c157e998b
commit 6d26b47521
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/templates/add.html
View File

@ -794,7 +794,7 @@
In this section you can create, edit and delete options with given parameters. And after use them as autocomplete in the "Add" sections
</div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
How to use pre saved option you can see in
How to use pre-saved option you can see in
<a href="https://roxy-wi.org/description.py?description=saved" title="How to use pre saved options" target="_blank">
<b>this video</b>
</a>
@ -849,8 +849,8 @@
In this section you can create, edit and delete servers. And after use them as autocomplete in the "Add" sections
</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://roxy-wi.org/description.py?description=saved" title="How to use pre saved servers" target="_blank">
How to use pre-saved servers you can see in
<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>
@ -945,16 +945,17 @@
In this section you can create userlists. And after use them in the "Add" sections
</div>
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
How to use userlists you can read
Read
<a href="https://roxy-wi.org/description.py?description=userlist" title="How to use userlists" target="_blank">
<b>here</b>
</a>
How to use userlists
</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>
<caption><h3>Add Peer</h3></caption>
<tr>
<td class="addName">Select server: </td>
<td class="addOption">
@ -995,7 +996,7 @@
</tr>
<tr>
<td class="addButton">
<a class="ui-button ui-widget ui-corner-all" title="Add Userlist" onclick="addProxy('add-peers')">Add Peers</a>
<a class="ui-button ui-widget ui-corner-all" title="Add Userlist" onclick="addProxy('add-peers')">Add Peer</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>
@ -1012,10 +1013,11 @@
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
Read
<a href="https://roxy-wi.org/howto.py?howto=peers" title="How to use peers" target="_blank">
<b>here</b>
</a>
How to use peers
</div>
</div>
<div id="lists">

42
app/templates/ovw.html
View File

@ -28,18 +28,20 @@
Server
{% endif %}
</td>
<td class="padding10 third-collumn-wi" style="width: 20%;">
<td class="padding10 third-collumn-wi" style="width: 20%;">
<a href="/app/hapservers.py" title="HAProxy servers overview" class="logs_link">
HAProxy
</a>
</td>
<td class="padding10">
<td class="padding10">
<a href="/app/hapservers.py?service=nginx" title="Nginx servers overview" class="logs_link">
Nginx
</a>
</td>
<td class="padding10">
Keepalived
<td class="padding10">
<a href="/app/hapservers.py?service=keepalived" title="Nginx servers overview" class="logs_link">
Keepalived
</a>
</td>
<td class="padding10">
<a href="/app/waf.py" title="WAf servers overview" class="logs_link">
@ -247,7 +249,7 @@
<span class="serverUp server-status" title="running {{grafana}} process"></span>
<a href="http://{{host}}:3000" target="_blank" title="Open Grafana" class="logs_link">Grafana</a>
{% else %}
<span class="serverNone server-status" title="The service does not started or does not installed"></span>
<span class="serverNone server-status" title="The service is not installed or not running"></span>
<span>Grafana</span>
{% endif %}
</td>
@ -256,7 +258,7 @@
<span class="serverUp server-status" title="running {{ prometheus }} process"></span>
<a href="http://{{host}}:9090" target="_blank" title="Open Prometheus" class="logs_link">Prometheus</a>
{% else %}
<span class="serverNone server-status" title="The service does not started or does not installed"></span>
<span class="serverNone server-status" title="The service is not installed or not running"></span>
Prometheus
{% endif %}
</td>
@ -309,33 +311,33 @@
<tr class="{{ loop.cycle('odd', 'even') }}">
<td class="padding10 first-collumn-wi">
<a href="{{admin_uri}}#users" title="Edit user" class="logs_link div-pic">
{{ USER.1 }}
{{ USER.username }}
</a>
</td>
<td class="third-collumn-wi">
{% for group in users_groups %}
{% if USER.0|string() == group.0|string() %}
{{ group.1 }}
{% if USER.user_id|string() == group.user_id|string() %}
{{ group.groups.name }}
{% endif %}
{% endfor %}
</td>
<td colspan="2">{{ USER.4 }}</td>
<td colspan="2">{{ USER.role }}</td>
</tr>
{% else %}
<tr style="display: none;" class="show-users {{ loop.cycle('odd', 'even') }}">
<td class="padding10 first-collumn-wi">
<a href="users.py#users" title="Edit user" class="logs_link div-pic">
{{ USER.1 }}
{{ USER.username }}
</a>
</td>
<td class="third-collumn-wi">
{% for group in users_groups %}
{% if group.0|string() == USER.0|string() %}
{{ group.1 }}{{ "," if not loop.last }}
{% if group.user_id|string() == USER.user_id|string() %}
{{ group.groups.name }}{{ "," if not loop.last }}
{% endif %}
{% endfor %}
</td>
<td colspan="2">{{ USER.4 }}</td>
<td colspan="2">{{ USER.role }}</td>
</tr>
{% endif %}
{% endfor %}
@ -361,19 +363,19 @@
<tr class="{{ loop.cycle('odd', 'even') }}">
<td class="padding10 first-collumn-wi">
<a href="users.py#groups" title="Edit groups" class="logs_link div-pic">
{{ group.1 }}
{{ group.name }}
</a>
</td>
<td class="third-collumn-wi" colspan="2">{{ group.2 }}</td>
<td class="third-collumn-wi" colspan="2">{{ group.description }}</td>
</tr>
{% else %}
<tr style="display: none;" class="show-groups {{ loop.cycle('odd', 'even') }}">
<td class="padding10 first-collumn-wi">
<a href="users.py#groups" title="Edit groups" class="logs_link div-pic">
{{ group.1 }}
{{ group.name }}
</a>
</td>
<td class="third-collumn-wi" colspan="2">{{ group.2 }}</td>
<td class="third-collumn-wi" colspan="2">{{ group.description }}</td>
</tr>
{% endif %}
{% endfor %}
@ -389,9 +391,9 @@
{% for role in roles %}
<tr class="{{ loop.cycle('odd', 'even') }}">
<td class="padding10 first-collumn-wi">
{{ role.1 }}
{{ role.name }}
</td>
<td class="third-collumn-wi">{{ role.2 }}</td>
<td class="third-collumn-wi">{{ role.description }}</td>
<td></td>
<td></td>
</tr>

2
inc/add.js
View File

@ -1700,7 +1700,7 @@ function addProxy(form_name) {
toastr.error('error: Proxy cannot be empty');
} else {
toastr.clear();
toastr.success('Section: ' + data + 'has been added. Do not forget restart server');
toastr.success('Section: ' + data + 'has been added. Do not forget to restart the server');
var ip = frm.find('select[name=serv]').val();
localStorage.setItem('restart', ip);
resetProxySettings();