This commit is contained in:
Donald Zou 2024-12-12 18:13:19 +08:00
parent f05dc26fe5
commit d917937866
2 changed files with 9 additions and 8 deletions

View File

@ -22,12 +22,12 @@ log_level = "debug"
capture_output = True
errorlog = f"./log/error_{date}.log"
if os.path.exists("./ssl.ini"):
if os.path.exists("./ssl-tls.ini"):
sslConfig = configparser.ConfigParser()
sslConfig.read_file(open('./ssl.ini', 'r'))
if sslConfig.has_section('SSL'):
cert = sslConfig.get('SSL', 'certificate_path')
pem = sslConfig.get('SSL', 'private_key_path')
sslConfig.read_file(open('./ssl-tls.ini', 'r'))
if sslConfig.has_section('SSL/TLS'):
cert = sslConfig.get('SSL/TLS', 'certificate_path')
pem = sslConfig.get('SSL/TLS', 'private_key_path')
if cert and pem and len(cert) > 0 and len(pem) > 0:
certfile = cert
keyfile = pem

View File

@ -24,6 +24,7 @@ else
cb_work_dir=/etc/letsencrypt
cb_config_dir=/var/lib/letsencrypt
fi
selected_url="https://pypi.org/simple/"
dashes='------------------------------------------------------------'
equals='============================================================'
@ -289,10 +290,10 @@ install_wgd(){
else
printf "[WGDashboard] %s Found existing ./db folder\n" "$heavy_checkmark"
fi
if [ ! -f "ssl.ini" ]
if [ ! -f "ssl-tls.ini" ]
then
printf "[SSL]\ncertificate_path = \nprivate_key_path = \n" >> ssl.ini
printf "[WGDashboard] %s Created ssl.ini\n" "$heavy_checkmark"
printf "[SSL/TLS]\ncertificate_path = \nprivate_key_path = \n" >> ssl-tls.ini
printf "[WGDashboard] %s Created ssl-tls.ini\n" "$heavy_checkmark"
else
printf "[WGDashboard] %s Found existing ssl.ini\n" "$heavy_checkmark"
fi