From f2f817fa31d4afa8295b436a27091c0675b9cdd5 Mon Sep 17 00:00:00 2001
From: Arthur Lu <root@tronnet.net>
Date: Tue, 11 Jun 2024 19:04:53 +0000
Subject: [PATCH] fix issue in setup script

---
 setup.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setup.sh b/setup.sh
index b4cbb21..672cc77 100755
--- a/setup.sh
+++ b/setup.sh
@@ -52,7 +52,8 @@ echo "DO TLS        = ${DO_TLS}"
 echo "+===============+"
 
 read -p "Base DN: " BASE_DN
-if [ "$DO_FIRST" = 1 ]; then
+
+if [ "$DO_INIT" = 1 ]; then
     read -p "Admin User ID: " ADMIN_ID
     read -p "Admin User Email: " ADMIN_EMAIL
     read -p "Admin User CN: " ADMIN_CN
@@ -65,6 +66,7 @@ if [ "$DO_FIRST" = 1 ]; then
         ! [ "$ADMIN_PASSWD" = "$CONFIRM_PASSWD" ]
     do echo "Passwords must match" ; done
 fi
+
 if [ "$DO_TLS" = 1 ]; then
     read -p "CA Cert File Path: " CA_FILE
     read -p "Server Cert File Path: " CERT_FILE
@@ -76,13 +78,15 @@ if [ "$DO_AUTH" = 1 ]; then
     sudo ldapmodify -H ldapi:/// -Y EXTERNAL -f auth.ldif
     rm auth.ldif
 fi
-if [ "$DO_FIRST" = 1 ]; then
+
+if [ "$DO_INIT" = 1 ]; then
     envsubst '$BASE_DN' < pass.template.ldif > pass.ldif
     envsubst '$BASE_DN:$ADMIN_ID:$ADMIN_EMAIL:$ADMIN_CN:$ADMIN_SN:$ADMIN_PASSWD' < init.template.ldif > init.ldif
     sudo ldapmodify -H ldapi:/// -Y EXTERNAL -f pass.ldif
     sudo ldapadd -H ldapi:/// -Y EXTERNAL -c -f init.ldif
     rm pass.ldif init.ldif
 fi
+
 if [ "$DO_TLS" = 1 ]; then
     envsubst '$CA_FILE:$CERT_FILE:$KEY_FILE' < tls.template.ldif > tls.ldif
     sudo ldapmodify -Y EXTERNAL -H ldapi:/// -f tls.ldif