mirror of https://github.com/Aidaho12/haproxy-wi
parent
438b2a5fee
commit
fb3b1d1867
|
@ -54,8 +54,8 @@ def check_is_service_folder(service_path: str) -> bool:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
def return_nice_path(return_path: str) -> str:
|
def return_nice_path(return_path: str, is_service=1) -> str:
|
||||||
if not check_is_service_folder(return_path):
|
if not check_is_service_folder(return_path) and is_service:
|
||||||
return 'error: The path must contain the name of the service. Check it in Roxy-WI settings'
|
return 'error: The path must contain the name of the service. Check it in Roxy-WI settings'
|
||||||
|
|
||||||
if return_path[-1] != '/':
|
if return_path[-1] != '/':
|
||||||
|
|
|
@ -221,7 +221,7 @@ def get_saved_servers(group: str, term: str) -> None:
|
||||||
|
|
||||||
def get_le_cert(server_ip: str, lets_domain: str, lets_email: str) -> None:
|
def get_le_cert(server_ip: str, lets_domain: str, lets_email: str) -> None:
|
||||||
proxy = sql.get_setting('proxy')
|
proxy = sql.get_setting('proxy')
|
||||||
ssl_path = common.return_nice_path(sql.get_setting('cert_path'))
|
ssl_path = common.return_nice_path(sql.get_setting('cert_path'), is_service=0)
|
||||||
haproxy_dir = sql.get_setting('haproxy_dir')
|
haproxy_dir = sql.get_setting('haproxy_dir')
|
||||||
script = "letsencrypt.sh"
|
script = "letsencrypt.sh"
|
||||||
proxy_serv = ''
|
proxy_serv = ''
|
||||||
|
|
Loading…
Reference in New Issue