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

v7.0.3.0 

Fix Let's encrypt
pull/372/head
Aidaho 2023-11-16 14:39:06 +03:00
parent c45532cfe4
commit b2ecaa2e61
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/modules/config/add.py
View File

@ -447,9 +447,8 @@ def create_saved_server(server: str, group: str, desc: str) -> str:
return render_template('ajax/new_saved_servers.html', server=sql.select_saved_servers(server=server)) return render_template('ajax/new_saved_servers.html', server=sql.select_saved_servers(server=server))
def get_saved_servers(group: str, term: str) -> str: def get_saved_servers(group: str, term: str) -> dict:
servers = sql.select_saved_servers(group=group, term=term) servers = sql.select_saved_servers(group=group, term=term)
a = {} a = {}
v = 0 v = 0
for i in servers: for i in servers:
@ -470,14 +469,15 @@ def get_le_cert(server_ip: str, lets_domain: str, lets_email: str) -> str:
script = "letsencrypt.sh" script = "letsencrypt.sh"
proxy_serv = '' proxy_serv = ''
ssh_settings = ssh_mod.return_ssh_keys_path(server_ip) ssh_settings = ssh_mod.return_ssh_keys_path(server_ip)
full_path = '/var/www/haproxy-wi/app'
os.system(f"cp scripts/{script} .") os.system(f"cp {full_path}/scripts/{script} {full_path}/{script}")
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
commands = [ commands = [
f"chmod +x {script} && ./{script} PROXY={proxy_serv} haproxy_dir={haproxy_dir} DOMAIN={lets_domain} " f"chmod +x {full_path}/{script} && {full_path}/{script} PROXY={proxy_serv} haproxy_dir={haproxy_dir} DOMAIN={lets_domain} "
f"EMAIL={lets_email} SSH_PORT={ssh_settings['port']} SSL_PATH={ssl_path} HOST={server_ip} USER={ssh_settings['user']} " f"EMAIL={lets_email} SSH_PORT={ssh_settings['port']} SSL_PATH={ssl_path} HOST={server_ip} USER={ssh_settings['user']} "
f"PASS='{ssh_settings['password']}' KEY={ssh_settings['key']}" f"PASS='{ssh_settings['password']}' KEY={ssh_settings['key']}"
] ]
@ -497,7 +497,7 @@ def get_le_cert(server_ip: str, lets_domain: str, lets_email: str) -> str:
except Exception: except Exception:
return output return output
else: else:
os.remove(script) os.remove(f'{full_path}/{script}')
return 'success: Certificate has been created' return 'success: Certificate has been created'