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

gen - display the reason when ignoring a variable

Browse Source
This commit is contained in:
bunkerity 2021-06-14 09:58:04 +02:00
parent ab9f9e0a4c
commit 01857d8ac0
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autoconf/AutoConf.py
View File

@ -29,6 +29,10 @@ class AutoConf :
env = instance.attrs["Config"]["Env"] env = instance.attrs["Config"]["Env"]
for entry in env : for entry in env :
self.__env[entry.split("=")[0]] = entry.replace(entry.split("=")[0] + "=", "", 1) self.__env[entry.split("=")[0]] = entry.replace(entry.split("=")[0] + "=", "", 1)
blacklist = ["NGINX_VERSION", "NJS_VERSION", "PATH", "PKG_RELEASE"]
for entry in blacklist :
if entry in self.__env :
del self.__env[entry]
if not "SERVER_NAME" in self.__env or self.__env["SERVER_NAME"] == "" : if not "SERVER_NAME" in self.__env or self.__env["SERVER_NAME"] == "" :
self.__env["SERVER_NAME"] = [] self.__env["SERVER_NAME"] = []
else : else :

2
entrypoint/jobs.sh
View File

@ -58,7 +58,7 @@ if [ "$files" != "" ] ; then
if [ "$EMAIL_LETS_ENCRYPT" = "" ] ; then if [ "$EMAIL_LETS_ENCRYPT" = "" ] ; then
EMAIL_LETS_ENCRYPT="contact@${FIRST_SERVER}" EMAIL_LETS_ENCRYPT="contact@${FIRST_SERVER}"
fi fi
certbot_outpout=$(/opt/scripts/certbot-new.sh "$(echo -n $SERVER_NAME | sed 's/ /,/g')" "$EMAIL_LETS_ENCRYPT" 2>&1) certbot_output=$(/opt/scripts/certbot-new.sh "$(echo -n $SERVER_NAME | sed 's/ /,/g')" "$EMAIL_LETS_ENCRYPT" 2>&1)
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
echo "[*] Certbot new successfully executed for domain(s) $(echo -n $SERVER_NAME | sed 's/ /,/g')" echo "[*] Certbot new successfully executed for domain(s) $(echo -n $SERVER_NAME | sed 's/ /,/g')"
else else

13
gen/Configurator.py
View File

@ -21,10 +21,11 @@ class Configurator :
def load_variables(self, vars, multisite_only=False) : def load_variables(self, vars, multisite_only=False) :
for var, value in vars.items() : for var, value in vars.items() :
if self.__check_var(var, value) : check, reason = self.__check_var(var, value)
if check :
self.__variables[var] = value self.__variables[var] = value
else : else :
print("Ignoring " + var + "=" + value) print("Ignoring " + var + "=" + value + " (" + reason + ")")
def get_config(self) : def get_config(self) :
config = {} config = {}
@ -45,4 +46,10 @@ class Configurator :
real_var = "_".join(var.split("_")[:-1]) real_var = "_".join(var.split("_")[:-1])
else : else :
real_var = "_".join(var.split("_")[:-1][1:]) real_var = "_".join(var.split("_")[:-1][1:])
return real_var != "" and re.search(self.__settings[real_var]["regex"], value) and (not multisite_only or self.__settings[real_var]["context"] == "multisite") if real_var == "" :
return False, "doesn't exist"
elif not re.search(self.__settings[real_var]["regex"], value) :
return False, "doesn't match regex : " + self.__settings[real_var]["regex"]
elif multisite_only and self.__settings[real_var]["context"] != "multisite" :
return False, "not at multisite context"
return True, ""