mirror of https://github.com/Aidaho12/haproxy-wi
Aidaho12
parent
cd462dcb7d
commit
653443cdde
17
README.md
17
README.md
|
|
@ -13,10 +13,11 @@ A simple web interface(user-frendly web GUI) for managing Haproxy servers. Leave
|
|||
7. Add sections: listen, frontend, backend from web interface
|
||||
8. Editing configs
|
||||
9. Rollback to previous versions of the config
|
||||
10. Comparing versions of configs
|
||||
11. Users roles: admin, editor, viewer
|
||||
12. Server groups
|
||||
13. Telegram notification
|
||||
10. Master/slave servers
|
||||
11. Comparing versions of configs
|
||||
12. Users roles: admin, editor, viewer
|
||||
13. Server groups
|
||||
14. Telegram notification
|
||||
|
||||
# Install
|
||||
|
||||
|
|
@ -32,7 +33,7 @@ $ chmod +x haproxy-wi/cgi-bin/*.py
|
|||
|
||||
For Apache do virtualhost with cgi-bin. Like this:
|
||||
```
|
||||
<VirtualHost *:80>
|
||||
<VirtualHost *:8000>
|
||||
ServerName haproxy-wi
|
||||
ErrorLog /var/log/httpd/haproxy-wi.error.log
|
||||
CustomLog /var/log/httpd/haproxy-wi.access.log combined
|
||||
|
|
@ -80,6 +81,12 @@ For Runtime API enable state file on HAproxt servers and need install socat on a
|
|||
```
|
||||
|
||||
|
||||
# Update DB
|
||||
```
|
||||
$ cd /var/www/haproxy-wi/cgi-bin
|
||||
$ ./update_db.py
|
||||
```
|
||||
|
||||
# Further development and support
|
||||
|
||||
Offer your ideas and wishes, ask questions. All this is [welcomed](https://github.com/Aidaho12/haproxy-wi/issues)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import os
|
|||
import http.cookies
|
||||
from configparser import ConfigParser, ExtendedInterpolation
|
||||
import funct
|
||||
import sql
|
||||
|
||||
form = cgi.FieldStorage()
|
||||
serv = form.getvalue('serv')
|
||||
|
|
@ -61,6 +62,11 @@ if form.getvalue('serv') is not None and form.getvalue('config') is not None:
|
|||
|
||||
print("<center><b>New config was saved as: %s </b></br></br></center>" % cfg)
|
||||
|
||||
MASTERS = sql.is_master(serv)
|
||||
for master in MASTERS:
|
||||
if master[0] != None:
|
||||
funct.upload_and_restart(master[0], cfg, just_save=save)
|
||||
|
||||
funct.upload_and_restart(serv, cfg, just_save=save)
|
||||
|
||||
os.system("/bin/diff -ub %s %s >> %s/config_edit-%s.log" % (oldcfg, cfg, log_path, funct.get_data('logs')))
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import html
|
|||
import cgi
|
||||
import os
|
||||
import funct
|
||||
import sql
|
||||
from configparser import ConfigParser, ExtendedInterpolation
|
||||
|
||||
form = cgi.FieldStorage()
|
||||
|
|
@ -79,6 +80,11 @@ if form.getvalue('serv') is not None and form.getvalue('config') is not None:
|
|||
|
||||
print("<center><b>Uploaded old config ver: %s </b></br></br></center>" % configver)
|
||||
|
||||
MASTERS = sql.is_master(serv)
|
||||
for master in MASTERS:
|
||||
if master[0] != None:
|
||||
funct.upload_and_restart(master[0], configver, just_save=save)
|
||||
|
||||
funct.upload_and_restart(serv, configver, just_save=save)
|
||||
|
||||
print('</br><a href="viewsttats.py?serv=%s" target="_blank" title="View stats">Go to view stats</a> <br />' % serv)
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ def update_db_v_2_0_1_1():
|
|||
try:
|
||||
cur.execute(sql)
|
||||
except sqltool.Error as e:
|
||||
if e.args[0] == 'duplicate column name: enable':
|
||||
print('Already updated. No run more. Thx =^.^=')
|
||||
if e.args[0] == 'duplicate column name: enable' or e == "1060 (42S21): Duplicate column name 'enable' ":
|
||||
print('Updating... go to version 2.0.5')
|
||||
return False
|
||||
else:
|
||||
print("An error occurred:", e)
|
||||
|
|
@ -179,9 +179,30 @@ def update_db_v_2_0_1_1():
|
|||
cur.close()
|
||||
con.close()
|
||||
|
||||
def update_db_v_2_0_5():
|
||||
con, cur = get_cur()
|
||||
sql = """
|
||||
ALTER TABLE `servers` ADD COLUMN master INTEGER NOT NULL DEFAULT 0;
|
||||
"""
|
||||
try:
|
||||
cur.execute(sql)
|
||||
except sqltool.Error as e:
|
||||
if e.args[0] == 'duplicate column name: master':
|
||||
print('Already updated. No run more. Thx =^.^=')
|
||||
return False
|
||||
else:
|
||||
print("An error occurred:", e)
|
||||
return False
|
||||
else:
|
||||
print("DB was update to 2.0.5")
|
||||
return True
|
||||
cur.close()
|
||||
con.close()
|
||||
|
||||
def update_all():
|
||||
update_db_v_2_0_1()
|
||||
update_db_v_2_0_1_1()
|
||||
update_db_v_2_0_5()
|
||||
|
||||
#if check_db():
|
||||
# create_table()
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ def links():
|
|||
'</li>')
|
||||
print('</ul>'
|
||||
'</nav>'
|
||||
'<div class="copyright-menu">HAproxy-WI v2.0.4</div>'
|
||||
'<div class="copyright-menu">HAproxy-WI v2.0.5</div>'
|
||||
'</div>')
|
||||
|
||||
def show_login_links():
|
||||
|
|
@ -528,7 +528,7 @@ def chooseServer(formName, title, note, **kwargs):
|
|||
|
||||
print('</p></form>')
|
||||
|
||||
#if note == "y":
|
||||
# print('<p><b>Note:</b> If you reconfigure First server, second will reconfigured automatically</p>')
|
||||
if note == "y":
|
||||
print('<p><b>Note:</b> If you reconfigure First server, second will reconfigured automatically</p>')
|
||||
print('</center>')
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ if mysql_enable == '1':
|
|||
from mysql.connector import errorcode
|
||||
import mysql.connector as sqltool
|
||||
else:
|
||||
db = "haproxy-wi-test.db"
|
||||
db = "haproxy-wi.db"
|
||||
import sqlite3 as sqltool
|
||||
|
||||
def add_user(user, email, password, role, group):
|
||||
|
|
@ -114,9 +114,9 @@ def update_group(name, descript, id):
|
|||
cur.close()
|
||||
con.close()
|
||||
|
||||
def add_server(hostname, ip, group, typeip, enable):
|
||||
def add_server(hostname, ip, group, typeip, enable, master):
|
||||
con, cur = create_db.get_cur()
|
||||
sql = """INSERT INTO servers (hostname, ip, groups, type_ip, enable) VALUES ('%s', '%s', '%s', '%s', '%s')""" % (hostname, ip, group, typeip, enable)
|
||||
sql = """INSERT INTO servers (hostname, ip, groups, type_ip, enable, master) VALUES ('%s', '%s', '%s', '%s', '%s', '%s')""" % (hostname, ip, group, typeip, enable, master)
|
||||
try:
|
||||
cur.execute(sql)
|
||||
con.commit()
|
||||
|
|
@ -143,15 +143,16 @@ def delete_server(id):
|
|||
cur.close()
|
||||
con.close()
|
||||
|
||||
def update_server(hostname, ip, group, typeip, enable, id):
|
||||
def update_server(hostname, ip, group, typeip, enable, master, id):
|
||||
con, cur = create_db.get_cur()
|
||||
sql = """update servers set
|
||||
hostname = '%s',
|
||||
ip = '%s',
|
||||
groups = '%s',
|
||||
type_ip = '%s',
|
||||
enable = '%s'
|
||||
where id = '%s'""" % (hostname, ip, group, typeip, enable, id)
|
||||
enable = '%s',
|
||||
master = '%s'
|
||||
where id = '%s'""" % (hostname, ip, group, typeip, enable, master, id)
|
||||
try:
|
||||
cur.execute(sql)
|
||||
con.commit()
|
||||
|
|
@ -225,6 +226,8 @@ def select_servers(**kwargs):
|
|||
sql = """select * from servers where hostname='%s' """ % kwargs.get("server")
|
||||
if kwargs.get("full") is not None:
|
||||
sql = """select * from servers ORDER BY groups """
|
||||
if kwargs.get("get_master_servers") is not None:
|
||||
sql = """select id,hostname from servers where master = 0 and type_ip = 0 and enable = 1 ORDER BY groups """
|
||||
try:
|
||||
cur.execute(sql)
|
||||
except sqltool.Error as e:
|
||||
|
|
@ -298,6 +301,16 @@ def get_dick_permit(**kwargs):
|
|||
cur.close()
|
||||
con.close()
|
||||
|
||||
def is_master(ip):
|
||||
con, cur = create_db.get_cur()
|
||||
sql = """ select slave.ip from servers left join servers as slave on servers.id = slave.master where servers.ip = '%s' """ % ip
|
||||
try:
|
||||
cur.execute(sql)
|
||||
except sqltool.Error as e:
|
||||
return False
|
||||
else:
|
||||
return cur
|
||||
|
||||
def show_update_servers():
|
||||
SERVERS = select_servers()
|
||||
print('<tr class="overviewHead">'
|
||||
|
|
@ -337,7 +350,6 @@ def show_update_user(user):
|
|||
need_id_group = "usergroup-%s" % users[0]
|
||||
get_groups_select(need_id_group, selected=users[5])
|
||||
print('</td>')
|
||||
#print('<td><a class="update-row" onclick="updateUser(%s)" style="cursor: pointer;"></a></td>' % users[0])
|
||||
print('<td><a class="delete" onclick="removeUser(%s)" style="cursor: pointer;"></a></td>' % users[0])
|
||||
print('</tr>')
|
||||
|
||||
|
|
@ -357,7 +369,15 @@ def show_update_server(server):
|
|||
print('<td>')
|
||||
get_type_ip_checkbox(server[0])
|
||||
print('</td>')
|
||||
#print('<td><a class="update-row" onclick="updateServer(%s)" style="cursor: pointer;"></a></td>' % server[0])
|
||||
print('<td><select id="slavefor-%s"><option value="0" selected>Not slave</option>' % server[0])
|
||||
MASTERS = select_servers(get_master_servers=1)
|
||||
for master in MASTERS:
|
||||
if master[0] == server[6]:
|
||||
selected = "selected"
|
||||
else:
|
||||
selected = ""
|
||||
print('<option value="%s" %s>%s</option>' % (master[0], selected, master[1]))
|
||||
print('</select></td>')
|
||||
print('<td><a class="delete" onclick="removeServer(%s)" style="cursor: pointer;"></a></td>' % server[0])
|
||||
print('</tr>')
|
||||
|
||||
|
|
@ -455,12 +475,13 @@ if form.getvalue('newserver') is not None:
|
|||
group = form.getvalue('newservergroup')
|
||||
typeip = form.getvalue('typeip')
|
||||
enable = form.getvalue('enable')
|
||||
master = form.getvalue('slave')
|
||||
if ip is None or group is None:
|
||||
print('Content-type: text/html\n')
|
||||
print(error_mess)
|
||||
else:
|
||||
print('Content-type: text/html\n')
|
||||
if add_server(hostname, ip, group, typeip, enable):
|
||||
if add_server(hostname, ip, group, typeip, enable, master):
|
||||
show_update_server(hostname)
|
||||
|
||||
if form.getvalue('serverdel') is not None:
|
||||
|
|
@ -497,11 +518,12 @@ if form.getvalue('updateserver') is not None:
|
|||
group = form.getvalue('servergroup')
|
||||
typeip = form.getvalue('typeip')
|
||||
enable = form.getvalue('enable')
|
||||
master = form.getvalue('slave')
|
||||
id = form.getvalue('id')
|
||||
if name is None or ip is None:
|
||||
print('Content-type: text/html\n')
|
||||
print(error_mess)
|
||||
else:
|
||||
print('Content-type: text/html\n')
|
||||
update_server(name, ip, group, typeip, enable, id)
|
||||
update_server(name, ip, group, typeip, enable, master, id)
|
||||
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-"
|
||||
import create_db
|
||||
from configparser import ConfigParser, ExtendedInterpolation
|
||||
|
||||
path_config = "haproxy-webintarface.config"
|
||||
config = ConfigParser(interpolation=ExtendedInterpolation())
|
||||
config.read(path_config)
|
||||
|
||||
mysql_enable = config.get('mysql', 'enable')
|
||||
|
||||
if mysql_enable == '1':
|
||||
from mysql.connector import errorcode
|
||||
import mysql.connector as sqltool
|
||||
else:
|
||||
db = "haproxy-wi.db"
|
||||
import sqlite3 as sqltool
|
||||
|
||||
create_db.update_all()
|
||||
|
|
@ -122,6 +122,7 @@ print('<br /><br /><table class="overview" id="group-add-table" style="display:
|
|||
'<td>Group</td>'
|
||||
'<td>Enable</td>'
|
||||
'<td>Virt</td>'
|
||||
'<td><span title="Actions with master config will automatically apply on slave">Slave for (?)</span></td>'
|
||||
'<td></td>'
|
||||
'<td></td>'
|
||||
'</tr>')
|
||||
|
|
@ -140,7 +141,15 @@ for server in SERVERS:
|
|||
print('<td>')
|
||||
sql.get_type_ip_checkbox(server[0])
|
||||
print('</td>')
|
||||
#print('<td><a class="update-row" onclick="updateServer(%s)" style="cursor: pointer;"></a></td>' % server[0])
|
||||
print('<td><select id="slavefor-%s"><option value="0" selected>Not slave</option>' % server[0])
|
||||
MASTERS = sql.select_servers(get_master_servers=1)
|
||||
for master in MASTERS:
|
||||
if master[0] == server[6]:
|
||||
selected = "selected"
|
||||
else:
|
||||
selected = ""
|
||||
print('<option value="%s" %s>%s</option>' % (master[0], selected, master[1]))
|
||||
print('</select></td>')
|
||||
print('<td><a class="delete" onclick="removeServer(%s)" style="cursor: pointer;"></a></td>' % server[0])
|
||||
print('</tr>')
|
||||
print('</table>'
|
||||
|
|
@ -152,6 +161,7 @@ print('</table>'
|
|||
'<td>Group</td>'
|
||||
'<td>Enable</td>'
|
||||
'<td>Virt</td>'
|
||||
'<td title="Actions with master config will automatically apply on slave">Slave for</td>'
|
||||
'<td></td>'
|
||||
'</tr>'
|
||||
'<tr>'
|
||||
|
|
@ -161,6 +171,11 @@ sql.get_groups_select("new-server-group-add")
|
|||
print('</td>'
|
||||
'<td><label for="enable"></label><input type="checkbox" id="enable" checked></td>'
|
||||
'<td><label for="typeip"></label><input type="checkbox" id="typeip"></td>'
|
||||
'<td><select id="slavefor" value="0" selected><option>Not slave</option>')
|
||||
MASTERS = sql.select_servers(get_master_servers=1)
|
||||
for master in MASTERS:
|
||||
print('<option value="%s">%s</option>' % (master[0], master[1]))
|
||||
print('</select></td>'
|
||||
'<td><a class="add-admin" id="add-server" style="cursor: pointer;"></a></td>'
|
||||
'</tr>')
|
||||
print('</table>')
|
||||
|
|
|
|||
|
|
@ -106,8 +106,8 @@
|
|||
font-family: "Font Awesome 5 Solid";
|
||||
content: "\f0ad";
|
||||
}
|
||||
.add-admin:before {
|
||||
.add-admin::before {
|
||||
display: none;
|
||||
font-family: "Font Awesome 5 Solid";
|
||||
content: "\f00c";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,8 @@ $( function() {
|
|||
newip: $('#new-ip').val(),
|
||||
newservergroup: $('#new-server-group-add').val(),
|
||||
typeip: typeip,
|
||||
enable: enable
|
||||
enable: enable,
|
||||
slave: $('#slavefor option:selected' ).val()
|
||||
},
|
||||
type: "GET",
|
||||
success: function( data ) {
|
||||
|
|
@ -282,6 +283,7 @@ function updateServer(id) {
|
|||
servergroup: $('#servergroup-'+id+' option:selected' ).val(),
|
||||
typeip: typeip,
|
||||
enable: enable,
|
||||
slave: $('#slavefor-'+id+' option:selected' ).val(),
|
||||
id: id
|
||||
},
|
||||
type: "GET",
|
||||
|
|
|
|||
Loading…
Reference in New Issue