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

v5.2.5.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2_5
pull/304/head
Pavel Loginov 2021-09-07 14:18:27 +06:00
parent d935377f41
commit e6c50ae758
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/funct.py
View File

@ -1409,4 +1409,5 @@ def is_service_active(server_ip: str, service_name: str):
cmd = ['systemctl is-active ' + service_name]
out = ssh_command(server_ip, cmd)
return True if 'active' in out else False
out = out.strip()
return True if 'active' == out else False

22
app/templates/add.html
View File

@ -26,8 +26,8 @@
<li><a href="#frontend" title="Add proxy: Create Frontend - Roxy-WI">Frontend</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 - Roxy-WI">SSL certificates</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 - Roxy-WI">Servers</a></li>
<li><a href="#option" title="Add proxy: Options templates - Roxy-WI">Options</a></li>
<li><a href="#add-servers" title="Add proxy: Servers templates - Roxy-WI">Servers</a></li>
<li><a href="#userlist" title="Add proxy: Create Userlists - Roxy-WI">Userlists</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>
@ -791,10 +791,10 @@
</tr>
</table>
<div id="ajax-option"></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;">
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;">
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
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>
@ -846,10 +846,10 @@
</tr>
</table>
<div id="ajax-servers"></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;">
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;">
<div class="add-note alert 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">
<b>this video</b>
@ -945,7 +945,7 @@
<div class="add-note addName alert-info" style="width: inherit; margin-right: 15px;">
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;">
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
Read
<a href="https://roxy-wi.org/description.py?description=userlist" title="How to use userlists" target="_blank">
<b>here</b>
@ -1007,13 +1007,13 @@
</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
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
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;">
<div class="add-note alert addName alert-info" style="width: inherit; margin-right: 15px;">
Read
<a href="https://roxy-wi.org/howto.py?howto=peers" title="How to use peers" target="_blank">
<b>here</b>
@ -1083,7 +1083,7 @@
</tr>
</table>
<div id="ajax"></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;">
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://roxy-wi.org/howto.py?howto=blacklist" title="How to create and manage blacklist" target="_blank">article</a>
</div>

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

@ -58,7 +58,7 @@
<div class="div-pannel">
<div class="div-server add-proxy-listen-head">
<div class="server-name">
<span title="Create presaved options" class="span-link" id="add4">Create presaved options</span>
<span title="Create an option template" class="span-link" id="add4">Create an option template</span>
</div>
<div class="server-desc add_proxy">
Create, edit and delete options with given parameters. And after use them as autocomplete in the "Add" sections
@ -110,7 +110,7 @@
<div class="div-pannel">
<div class="div-server add-proxy-frontend-head">
<div class="server-name">
<span title="Create presaved servers" class="span-link" id="add5">Create presaved servers</span>
<span title="Create a server template" class="span-link" id="add5">Create a server template</span>
</div>
<div class="server-desc add_proxy">
Create, edit and delete servers. And after use them as autocomplete in the "Add" sections