From 2957acb5799fda5b6033319bc421fe4fcb04b416 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 7 Aug 2018 13:04:34 +0100
Subject: [PATCH] Remove webadmin password file if there is a failure
generating it
---
src/freedombone-utils-webadmin | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 73e59f9bd..e022190a4 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -548,12 +548,17 @@ function web_admin_setup_login {
webadmin_password="$(create_password "${MINIMUM_PASSWORD_LENGTH}")"
# create a password for users
- touch /etc/nginx/.webadminpasswd
+ if [ ! -f /etc/nginx/.webadminpasswd ]; then
+ touch /etc/nginx/.webadminpasswd
+ fi
# create a password file used by nginx
echo -n "$webadmin_password" | htpasswd -i -s -c /etc/nginx/.webadminpasswd "admin"
if ! grep -q 'admin:' /etc/nginx/.webadminpasswd; then
echo $'/etc/nginx/.webadminpasswd password not created for admin'
+ if [ -f /etc/nginx/.webadminpasswd ]; then
+ rm /etc/nginx/.webadminpasswd
+ fi
exit 2428956
fi
--
GitLab