From 4fe5509b4889a97471b214c37f3dee98645771f0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 13 Jan 2019 16:19:29 +0000
Subject: [PATCH] Move nginx config on cancel or fail of app install
---
src/freedombone-addremove | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-addremove b/src/freedombone-addremove
index e108a9162..03ceedc14 100755
--- a/src/freedombone-addremove
+++ b/src/freedombone-addremove
@@ -84,7 +84,8 @@ fi
if [ -f "/etc/nginx/sites-available/${app_domain}" ]; then
echo "Removing /etc/nginx/sites-available/${app_domain}" >> "$webadmin_install_dir/applog.txt"
nginx_dissite "${app_domain}"
- rm "/etc/nginx/sites-available/${app_domain}"
+ mv "/etc/nginx/sites-available/${app_domain}" /root/.nginx_config
+ cat /root/.nginx_config >> "$webadmin_install_dir/applog.txt"
echo "Restarting nginx" >> "$webadmin_install_dir/applog.txt"
systemctl restart nginx
fi
@@ -97,6 +98,10 @@ fi
fi
)
+if [ -f /root/.nginx_config ]; then
+ rm /root/.nginx_config
+fi
+
if [ -f "$adding_app_file" ]; then
rm "$adding_app_file"
fi
--
GitLab