mirrors/haproxy-wi
1
0
Fork 0
mirror of https://github.com/roxy-wi/roxy-wi.git synced 2025-12-15 11:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

v4.2.3.0

Browse Source 
Changelog: https://haproxy-wi.org/changelog.py#4_2_3
This commit is contained in:
Pavel Loginov
2020-04-22 15:30:31 +02:00
parent 2e331a4582
commit 8c9c995b33
4 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/funct.py
View File

@@ -608,6 +608,8 @@ def upload_and_restart(serv, cfg, **kwargs):
commands = [ "sudo mv -f " + tmp_file + " " + config_path + " && sudo nginx -t -q && sudo systemctl reload nginx" ]
else:
commands = [ "sudo mv -f " + tmp_file + " " + config_path + " && sudo nginx -t -q && sudo systemctl restart nginx" ]
if sql.get_setting('firewall_enable') == "1":
commands[0] += open_port_firewalld(cfg, serv=serv, service='nginx')
else:
if kwargs.get("just_save") == "test":
commands = [ "sudo haproxy -q -c -f " + tmp_file + "&& sudo rm -f " + tmp_file ]
@@ -618,7 +620,7 @@ def upload_and_restart(serv, cfg, **kwargs):
else:
commands = [ "sudo haproxy -q -c -f " + tmp_file + "&& sudo mv -f " + tmp_file + " " + config_path + " && sudo systemctl restart haproxy" ]
if sql.get_setting('firewall_enable') == "1":
commands[0] += open_port_firewalld(cfg)
commands[0] += open_port_firewalld(cfg, serv=serv)
error += str(upload(serv, tmp_file, cfg, dir='fullpath'))
try:
@@ -644,7 +646,7 @@ def master_slave_upload_and_restart(serv, cfg, just_save, **kwargs):
return error
def open_port_firewalld(cfg):
def open_port_firewalld(cfg, serv, **kwargs):
try:
conf = open(cfg, "r")
except IOError:
@@ -654,16 +656,23 @@ def open_port_firewalld(cfg):
ports = ''
for line in conf:
if "bind" in line:
bind = line.split(":")
bind[1] = bind[1].strip(' ')
bind = bind[1].split("ssl")
bind = bind[0].strip(' \t\n\r')
firewalld_commands += ' sudo firewall-cmd --zone=public --add-port=%s/tcp --permanent -q &&' % bind
ports += bind+' '
if kwargs.get('service') == 'nginx':
if "listen " in line and '#' not in line:
listen = ' '.join(line.split())
listen = listen.split(" ")[1]
listen = listen.split(";")[0]
ports += listen+' '
else:
if "bind" in line:
bind = line.split(":")
bind[1] = bind[1].strip(' ')
bind = bind[1].split("ssl")
bind = bind[0].strip(' \t\n\r')
firewalld_commands += ' sudo firewall-cmd --zone=public --add-port=%s/tcp --permanent -q &&' % bind
ports += bind+' '
firewalld_commands += 'sudo firewall-cmd --reload -q'
logging('localhost', ' Next ports have opened: '+ports+ ' has opened ')
logging(serv, ' Next ports have been opened: '+ports+ ' has opened ')
return firewalld_commands