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

v4.4.1.0 

Changelog: https://haproxy-wi.org/changelog.py#4_4_1
pull/246/head
Pavel Loginov 2020-08-03 15:31:51 +02:00
parent eecfd6995f
commit 6158f2c878
10 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/add.py
View File

@ -43,7 +43,7 @@ white_lists = funct.get_files(dir=white_dir, format="lst")
black_lists = funct.get_files(dir=black_dir, format="lst") black_lists = funct.get_files(dir=black_dir, format="lst")
template = template.render(title = "Add", template = template.render(title = "Add: ",
role = role, role = role,
user = user, user = user,
selects = servers, selects = servers,

2
app/ha.py
View File

@ -17,7 +17,7 @@ except:
pass pass
output_from_parsed_template = template.render(h2 = 1, title = "Configure HA", output_from_parsed_template = template.render(h2 = 1, title = "Create and configure HA cluster",
role = role, role = role,
user = user, user = user,
serv = serv, serv = serv,

2
app/servers.py
View File

@ -21,7 +21,7 @@ except:
pass pass
output_from_parsed_template = template.render(title = "Servers manage", output_from_parsed_template = template.render(title = "Servers: ",
role = role, role = role,
user = user, user = user,
users = sql.select_users(group=user_group), users = sql.select_users(group=user_group),

18
app/templates/add.html
View File

@ -12,15 +12,15 @@ h3 {
<script src="/inc/add.js"></script> <script src="/inc/add.js"></script>
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#create">Create proxy</a></li> <li><a href="#create" title="Add proxy: Create proxy - HAProxy-WI">Create proxy</a></li>
<li><a href="#listen">Listen</a></li> <li><a href="#listen" title="Add proxy: Create Listen - HAProxy-WI">Listen</a></li>
<li><a href="#frontend">Frontend</a></li> <li><a href="#frontend" title="Add proxy: Create Frontend - HAProxy-WI">Frontend</a></li>
<li><a href="#backend">Backend</a></li> <li><a href="#backend" title="Add proxy: Create Backend - HAProxy-WI">Backend</a></li>
<li><a href="#ssl">SSL certificates</a></li> <li><a href="#ssl" title="Add proxy: Upload SSL certificates - HAProxy-WI">SSL certificates</a></li>
<li><a href="#option">Options</a></li> <li><a href="#option" title="Add proxy: Pre-saved options - HAProxy-WI">Options</a></li>
<li><a href="#add-servers">Servers</a></li> <li><a href="#add-servers" title="Add proxy: Pre-saved servers - HAProxy-WI">Servers</a></li>
<li><a href="#userlist">Userlists</a></li> <li><a href="#userlist" title="Add proxy: Create Userlists - HAProxy-WI">Userlists</a></li>
<li><a href="#lists">Lists</a></li> <li><a href="#lists" title="Add proxy: Create and upload whitelists or blacklists - HAProxy-WI">Lists</a></li>
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>
<ul id='browse_histroy'></ul> <ul id='browse_histroy'></ul>

18
app/templates/admin.html
View File

@ -11,15 +11,15 @@
{% include 'include/del_confirm.html' %} {% include 'include/del_confirm.html' %}
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#users">Users</a></li> <li><a href="#users" title="Admin area: Manage users - HAProxy-WI">Users</a></li>
<li><a href="#groups">Groups</a></li> <li><a href="#groups" title="Admin area: Manage groups - HAProxy-WI">Groups</a></li>
<li><a href="#servers">Servers</a></li> <li><a href="#servers" title="Admin area: Manage servers - HAProxy-WI">Servers</a></li>
<li><a href="#ssh">SSH credentials</a></li> <li><a href="#ssh" title="Admin area: Manage SSH credentials - HAProxy-WI">SSH credentials</a></li>
<li><a href="#checker">Checker</a></li> <li><a href="#checker" title="Admin area: Manage checker - HAProxy-WI">Checker</a></li>
<li><a href="#settings">Settings</a></li> <li><a href="#settings" title="Admin area: Manage HAProxy-WI settings - HAProxy-WI">Settings</a></li>
<li><a href="#services">Services</a></li> <li><a href="#services" title="Admin area: Manage HAProxy-WI services - HAProxy-WI">Services</a></li>
<li><a href="#updatehapwi">Update</a></li> <li><a href="#updatehapwi" title="Admin area: Update HAProxy-WI - HAProxy-WI">Update</a></li>
<li><a href="#backup">Backup</a></li> <li><a href="#backup" title="Admin area: Backup configs - HAProxy-WI">Backup</a></li>
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>
<ul id='browse_histroy'></ul> <ul id='browse_histroy'></ul>

60
app/templates/base.html
View File

@ -55,18 +55,18 @@
<ul class="menu"> <ul class="menu">
{% if user %} {% if user %}
<li><a href="/app/overview.py" title="Server and service status" class="overview-link">Overview</a></li> <li><a href="/app/overview.py" title="Server and service status" class="overview-link">Overview</a></li>
<li class="p_menu"><a title="Actions with Haproxy configs" class="config-show">Haproxy</a> <li class="p_menu"><a title="Actions with Haproxy" class="config-show">Haproxy</a>
<ul class="v_menu"> <ul class="v_menu">
<li><a href="/app/hapservers.py" title="Overview HAProxy servers" 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="Show stats" 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" class="runtime head-submenu">Runtime API</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/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 <= 2 %} {% if role <= 2 %}
<li><a href="/app/add.py#proxy" title="Add proxy" class="add head-submenu" id="add1">Add proxy</a></li> <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/versions.py" title="Actions with configs versions" 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="Upload SSL cert" class="cert head-submenu" id="add3">SSL</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#lists" title="Manage black and white lists" 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 - HAProxy-WI" class="lists head-submenu" id="add7">Lists</a></li>
<li><a href="/app/waf.py" title="Web application firewall" class="waf head-submenu">WAF</a> </li> <li><a href="/app/waf.py" title="Web application firewall" class="waf head-submenu">WAF</a> </li>
{% endif %} {% endif %}
</ul> </ul>
@ -74,21 +74,21 @@
{% if role <= 2 %} {% if role <= 2 %}
<li class="p_menu"> <li class="p_menu">
<a title="Nginx" class="nginx">Nginx</a> <a title="Actions with Nginx" class="nginx">Nginx</a>
<ul class="v_menu"> <ul class="v_menu">
<li><a href="/app/hapservers.py?service=nginx" title="Overview Nginx servers" class="overview-link head-submenu">Overview</a> </li> <li><a href="/app/hapservers.py?service=nginx" title="Overview Nginx servers" class="overview-link head-submenu">Overview</a> </li>
<li><a href="/app/config.py?service=nginx" title="Edit Nginx config" class="edit head-submenu">Configs</a></li> <li><a href="/app/config.py?service=nginx" title="Working with Nginx configs" class="edit head-submenu">Configs</a></li>
<li><a href="/app/viewsttats.py?service=nginx" title="Show stats" 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>
<li><a href="/app/versions.py?service=nginx" title="Actions with Nginx configs versions" 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="Upload SSL cert" class="cert head-submenu" id="add3">SSL</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>
</ul> </ul>
</li> </li>
<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 HA cluster" class="keepalived head-submenu">HA</a></li> <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/config.py?service=keepalived" title="Edit Keepalived config" 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="Actions with Keepalived configs versions" 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>
</li> </li>
<li class="p_menu"> <li class="p_menu">
@ -103,12 +103,12 @@
<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="Actions with users" class="users head-submenu">Users</a></li> <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#servers" title="Server manage" class="runtime head-submenu">Servers</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#ssh" title="Manage SSH credentials" class="admin head-submenu">SSH credentials</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#installproxy" title="Proxy services installation" class="hap head-submenu">Proxy installation</a> </li> <li><a href="/app/servers.py#installproxy" title="Servers: Proxy service installation - HAProxy-WI" class="hap head-submenu">Proxy installation</a> </li>
<li><a href="/app/servers.py#installmon" title="Monitoring services installation" class="hap1 head-submenu">Monitoring 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#backup" title="Backups HAProxy's config files" class="backup head-submenu">Backups</a> </li> <li><a href="/app/servers.py#backup" title="Servers: Backup configs - HAProxy-WI" class="backup head-submenu">Backups</a> </li>
</ul> </ul>
</li> </li>
{% endif %} {% endif %}
@ -116,14 +116,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="Actions with users" class="users head-submenu">Users</a></li> <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#groups" title="Actions with groups" class="group head-submenu">Groups</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#servers" title="Actions with servers" class="runtime head-submenu">Servers</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#ssh" title="Manage SSH credentials" class="admin head-submenu">SSH credentials</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#settings" title="HAProxy-WI settings" class="settings head-submenu">Settings</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#services" title="HAProxy-WI services" class="services head-submenu">Services</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/viewlogs.py" title="View internal logs" class="logs head-submenu">Internal logs</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/users.py#updatehapwi" title="Update HAProxy-WI" class="upload updatehapwi head-submenu">Update</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>
</ul> </ul>
</li> </li>
{% endif %} {% endif %}

10
app/templates/runtimeapi.html
View File

@ -6,12 +6,12 @@
<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">Runtime API</a></li> <li><a href="#runtimeapi" title="Runtime API - HAProxy-WI">Runtime API</a></li>
{% if role <= 2 %} {% if role <= 2 %}
<li><a href="#maxconn">Change Maxconn</a></li> <li><a href="#maxconn" title="Runtime API: Changing Maxconn - HAProxy-WI">Change Maxconn</a></li>
<li><a href="#ip">Change IP and Port</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="#table">Stick Table</a></li> <li><a href="#table" title="Runtime API: Stick Table - HAProxy-WI">Stick Table</a></li>
<li><a href="#lists">Lists</a></li> <li><a href="#lists" title="Runtime API: Change dynamically whitelist and blacklist - HAProxy-WI">Lists</a></li>
{% endif %} {% endif %}
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>

14
app/templates/servers.html
View File

@ -13,13 +13,13 @@
<input type="hidden" id="new-sshgroup" name="new-sshgroup" value="{{ group }}" > <input type="hidden" id="new-sshgroup" name="new-sshgroup" value="{{ group }}" >
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#users">Users</a></li> <li><a href="#users" title="Servers: Manage users - HAProxy-WI">Users</a></li>
<li><a href="#servers">Servers</a></li> <li><a href="#servers" title="Servers: Manage servers - HAProxy-WI">Servers</a></li>
<li><a href="#ssh">SSH credentials</a></li> <li><a href="#ssh" title="Servers: Manage SSH credentials - HAProxy-WI">SSH credentials</a></li>
<li><a href="#checker">Checker</a></li> <li><a href="#checker" title="Servers: Manage checker - HAProxy-WI">Checker</a></li>
<li><a href="#installproxy">Proxy installation</a></li> <li><a href="#installproxy" title="Servers: Proxy installation - HAProxy-WI">Proxy installation</a></li>
<li><a href="#installmon">Monitoring installation</a></li> <li><a href="#installmon" title="Servers: Monitoring installation - HAProxy-WI">Monitoring installation</a></li>
<li><a href="#backup">Backup</a></li> <li><a href="#backup" title="Servers: Backuping configs - HAProxy-WI">Backup</a></li>
{% include 'include/login.html' %} {% include 'include/login.html' %}
</ul> </ul>
<ul id='browse_histroy'></ul> <ul id='browse_histroy'></ul>

2
app/users.py
View File

@ -32,7 +32,7 @@ except:
pass pass
template = template.render(title = "Admin area: users manage", template = template.render(title = "Admin area: Manage users",
role = role, role = role,
user = user, user = user,
users = users, users = users,

8
inc/script.js
View File

@ -556,6 +556,14 @@ function viewLogs() {
} }
} }
$( function() { $( function() {
$('a').click(function(e) {
var cur_path = window.location.pathname;
$('title').text($(this).attr('title'));
history.pushState({}, '', $(this).attr('href'));
if ($(this).attr('href').split('#')[0] && $(this).attr('href').split('#')[0] != cur_path) {
window.history.go()
}
});
toastr.options.closeButton = true; toastr.options.closeButton = true;
toastr.options.progressBar = true; toastr.options.progressBar = true;
toastr.options.positionClass = 'toast-bottom-full-width'; toastr.options.positionClass = 'toast-bottom-full-width';