librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

remove .site files (gen), uninstall remove folder at the end (linux) and run jobs when reloading local instances (UI)

This commit is contained in:
bunkerity 2021-08-18 12:07:11 +02:00
parent 2a0b84074a
commit 8a4eb3f2a3
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gen/main.py
View File

@ -53,7 +53,7 @@ if __name__ == "__main__" :
# Remove old files
files = glob.glob(args.output + "/*")
for file in files :
if file.endswith(".conf") and os.path.isfile(file) and not os.path.islink(file) :
if (file.endswith(".conf") or file.endswith(".env")) and os.path.isfile(file) and not os.path.islink(file) :
os.remove(file)
elif os.path.isdir(file) and not os.path.islink(file) :
shutil.rmtree(file, ignore_errors=False)

12
helpers/uninstall.sh
View File

@ -47,12 +47,6 @@ fi
do_and_check_cmd mv /lib/systemd/system/nginx.service.bak /lib/systemd/system/nginx.service
do_and_check_cmd systemctl daemon-reload
# Remove /opt/bunkerized-nginx
if [ -e "/opt/bunkerized-nginx" ] ; then
echo "[*] Remove /opt/bunkerized-nginx"
do_and_check_cmd rm -rf /opt/bunkerized-nginx
fi
# Remove UI service
systemctl status bunkerized-nginx-ui > /dev/null 2>&1
if [ $? -eq 0 ] ; then
@ -78,5 +72,11 @@ if [ -e "$CRON_PATH" ] ; then
do_and_check_cmd rm -f "$CRON_PATH"
fi
# Remove /opt/bunkerized-nginx
if [ -e "/opt/bunkerized-nginx" ] ; then
echo "[*] Remove /opt/bunkerized-nginx"
do_and_check_cmd rm -rf /opt/bunkerized-nginx
fi
# We're done
echo "[*] bunkerized-nginx successfully uninstalled"

8
ui/src/Instances.py
View File

@ -103,8 +103,12 @@ class Instances :
instance = self.__instance_from_id(id)
result = True
if instance["type"] == "local" :
proc = subprocess.run(["/usr/sbin/nginx", "-s", "reload"], capture_output=True)
result = proc.returncode == 0
proc = subprocess.run(["/opt/bunkerized-nginx/entrypoint/jobs.sh"], capture_output=True)
if proc.returncode != 0 :
result = False
else :
proc = subprocess.run(["/usr/sbin/nginx", "-s", "reload"], capture_output=True)
result = proc.returncode == 0
elif instance["type"] == "container" or instance["type"] == "service" :
result = self.__api_request(instance, "/reload")
if result :