Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

various bug fixes related to HTTPS

Browse Source
This commit is contained in:
bunkerity
2021-05-28 14:57:45 +02:00
parent dfce0c06dd
commit c7b81cfc10
12 changed files with 95 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
autoconf/Config.py
View File

@@ -27,9 +27,11 @@ class Config :
stdout = proc.stdout.decode("ascii")
stderr = proc.stderr.decode("ascii")
if stdout != "" :
utils.log("[*] Jobs output : " + stdout)
for line in stdout.split("\n") :
utils.log("[*] Jobs output : " + stdout)
if stderr != "" :
utils.log("[!] Jobs error : " + stderr)
for line in stderr.split("\n") :
utils.log("[!] Jobs error : " + stderr)
return proc.returncode == 0
else :
utils.log("[!] bunkerized-nginx tasks are not started")
@@ -51,14 +53,16 @@ class Config :
stdout = proc.stdout.decode("ascii")
stderr = proc.stderr.decode("ascii")
if stdout != "":
utils.log("[*] Generator output : " + stdout)
for line in stdout.split("\n") :
utils.log("[*] Generator output : " + stdout)
if stderr != "" :
utils.log("[*] Generator error : " + stderr)
for line in stderr.split("\n") :
utils.log("[*] Generator error : " + stderr)
# We're done
if proc.returncode == 0 :
return True
utils.log("[!] Error while generating site config for " + vars["SERVER_NAME"] + " : return code = " + str(proc.returncode))
utils.log("[!] Error while generating site config for " + env["SERVER_NAME"] + " : return code = " + str(proc.returncode))
except Exception as e :
utils.log("[!] Exception while generating site config : " + str(e))

2
autoconf/dependencies.sh
View File

@@ -1,5 +1,5 @@
#!/bin/sh
# install dependencies
apk add py3-pip bash certbot curl logrotate openssl
apk add py3-pip bash certbot curl openssl
pip3 install docker requests jinja2