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

v5.0.1.0 

Changelog: https://haproxy-wi.org/changelog.py#5_0_1
pull/304/head
Pavel Loginov 2021-03-14 01:13:13 +06:00
parent 7c0aadc36c
commit 83b7c31bb5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/funct.py
View File

@ -495,8 +495,6 @@ def show_installation_output(error, output, service):
for l in output: for l in output:
if "Traceback" in l or "FAILED" in l: if "Traceback" in l or "FAILED" in l:
try: try:
l = l.split(':')[1]
l = l.split('"')[1]
print(l) print(l)
break break
except Exception: except Exception:
@ -530,7 +528,7 @@ def install_haproxy(serv, **kwargs):
os.system("cp scripts/%s ." % script) os.system("cp scripts/%s ." % script)
if hapver is None: if hapver is None:
hapver = '2.0.7-1' hapver = '2.3.0-1'
if proxy is not None and proxy != '' and proxy != 'None': if proxy is not None and proxy != '' and proxy != 'None':
proxy_serv = proxy proxy_serv = proxy

2
app/options.py
View File

@ -33,7 +33,7 @@ if form.getvalue('alert_consumer') is None:
if form.getvalue('getcerts') is not None and serv is not None: if form.getvalue('getcerts') is not None and serv is not None:
cert_path = sql.get_setting('cert_path') cert_path = sql.get_setting('cert_path')
commands = ["ls -1t " + cert_path + " |grep -E 'pem|crt|key'"] commands = ["sudo ls -1t " + cert_path + " |grep -E 'pem|crt|key'"]
try: try:
funct.ssh_command(serv, commands, ip="1") funct.ssh_command(serv, commands, ip="1")
except Exception as e: except Exception as e: