Baseprofilenames and configure checks for existing preconfigure

system_setup/configure.sh

@@ -39,8 +39,28 @@ override_conf_var() {
 }
 
 do_configure() {
-    mkdir -p "$(dirname "$CONF_FILE")"
+    if [[ -f "$CONF_FILE" ]]; then
-    cp "$CONF_DIST" "$CONF_FILE" # Either setup_system.conf or setup_system.conf.dist to config.d/configure.conf
+        echo "Existing preconfig found: $CONF_FILE"
+        while true; do
+            read -r -p "  Do you want to use it (1) or start with a new config (2): " CHOICE
+            case "${CHOICE}" in
+                1)
+                    echo "Using the existing File"
+                    break
+                    ;;
+                2)
+                    rm "$CONF_FILE"
+                    cp "${CONF_DIST}" "$CONF_FILE"
+                    break
+                    ;;
+                *)
+                    echo "  Please enter 1 or 2."
+                    ;;
+            esac
+        done
+    else
+        cp "${CONF_DIST}" "$CONF_FILE"
+    fi
 
     echo ""
     echo "=== System Configuration ==="
@@ -58,7 +78,7 @@ do_configure() {
         set_conf_var "REPO_BRANCH" "$REPO_BRANCH"
     fi
 
-    source "$( dirname "$0" )/setup_system.inc.sh"
+    source "$CONF_FILE"
     VARS=("TLDOMAIN" "SERVERFQDN_IPA" "DOMAIN" "SERVERFQDN_NC" "IPAVAULTUSE" "IPAVAULTNAME" "DISTCONFIGPATH_SRC" "CLIENTADMINGROUP" )
     for ELE in "${VARS[@]}"
     do
@@ -66,7 +86,7 @@ do_configure() {
             echo ""
             new_ELE=$(prompt_value "${ELE}" "${!ELE}")
             set_conf_var "${ELE}" "${new_ELE}"
-            source "$( dirname "$0" )/setup_system.inc.sh"
+            source "$CONF_FILE"
             REPEAT_TEST=1
             case ${ELE} in
                 "SERVERFQDN_NC") echo "=== Testing: Nextcloud server ==="