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

autoconf - fix bug when multiple server_name for one service

Browse Source
This commit is contained in:
bunkerity 2021-04-20 10:00:25 +02:00
parent 74417abc9c
commit 69fe066777
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autoconf/Config.py
View File

@ -107,13 +107,16 @@ class Config :
def activate(self, instances, vars, reload=True) : def activate(self, instances, vars, reload=True) :
try : try :
# Get first server name
first_server_name = vars["SERVER_NAME"].split(" ")[0]
# Check if file exists # Check if file exists
if not os.path.isfile("/etc/nginx/" + vars["SERVER_NAME"] + "/server.conf") : if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
utils.log("[!] /etc/nginx/" + vars["SERVER_NAME"] + "/server.conf doesn't exist") utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
return False return False
# Include the server conf # Include the server conf
utils.replace_in_file("/etc/nginx/nginx.conf", "}", "include /etc/nginx/" + vars["SERVER_NAME"] + "/server.conf;\n}") utils.replace_in_file("/etc/nginx/nginx.conf", "}", "include /etc/nginx/" + first_server_name + "/server.conf;\n}")
# Reload # Reload
if not reload or self.reload(instances) : if not reload or self.reload(instances) :
@ -126,13 +129,16 @@ class Config :
def deactivate(self, instances, vars) : def deactivate(self, instances, vars) :
try : try :
# Get first server name
first_server_name = vars["SERVER_NAME"].split(" ")[0]
# Check if file exists # Check if file exists
if not os.path.isfile("/etc/nginx/" + vars["SERVER_NAME"] + "/server.conf") : if not os.path.isfile("/etc/nginx/" + first_server_name + "/server.conf") :
utils.log("[!] /etc/nginx/" + vars["SERVER_NAME"] + "/server.conf doesn't exist") utils.log("[!] /etc/nginx/" + first_server_name + "/server.conf doesn't exist")
return False return False
# Remove the include # Remove the include
utils.replace_in_file("/etc/nginx/nginx.conf", "include /etc/nginx/" + vars["SERVER_NAME"] + "/server.conf;\n", "") utils.replace_in_file("/etc/nginx/nginx.conf", "include /etc/nginx/" + first_server_name + "/server.conf;\n", "")
# Reload # Reload
if self.reload(instances) : if self.reload(instances) :