Replaced conf by anonymous dist file

system_setup/setup_system.conf.dist

@@ -2,12 +2,12 @@
 # SPDX-FileCopyrightText: Daniel Pätzold
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
-export TLDOMAIN=obel1x.de
+export TLDOMAIN=domain.tld
 export DOMAIN=clients.${TLDOMAIN}
 export SERVERFQDN_IPA=ipa.${TLDOMAIN} # Needs to be the IPA- Server
 export SERVERFQDN_NC=nextcloud.${TLDOMAIN}
 export SYSCONFIGPATH="/sys_config"
-export INSTALLDOCS="https://dokuwiki.obel1x.de/content:serverbasics"
+export INSTALLDOCS="https://gitea.dtext.online/obel1x/fedora-OEMDRV/src/branch/main/README.md"
 export CLIENTADMINGROUP="clientadmins"
 
 # Method to determine Unique Hostname / FQDN of the Client. May be replaced by your needs
@@ -18,18 +18,14 @@ else
 fi
 export FQDN=${HOSTNM}.${DOMAIN}
 
-#Additional Client-Software- Repository-Folder (Shared Folder / Systemwide)
+#Additional Client-Software- Repository-Folder in Nextcloud (Shared Folder / Systemwide)
 export CLIENT_SOFTWARE_DST="/opt/client_software" # Optional. If you don't have a Folder that should always be synced, leave this empty
 export CLIENT_SOFTWARE_SRC="/Shared/sw_geteilt/client_software"
 
-#First run Service Name
-export FIRSTRUN_SERVICENAME="setup-system.service"
-export FIRSTRUN_SCRIPTPATH="/usr/lib/systemd/system"
-
 #Secure File Encryption
 #Needs a running KRA- Service on FreeIPA
 # Set to "true" to use Encryption via IPAVAULT - OTHERWISE YOUR FILES WILL NOT BE ENCRYPTED
-export IPAVAULTUSE="false"
+export IPAVAULTUSE="true"
 # Vaultname - can be any Name
 export IPAVAULTNAME="CLIENT_FILEENCRYPTION_"${HOSTNM}
 
@@ -67,6 +63,10 @@ if [ ${SCRIPTPATH::2} == "//" ]; then
 fi
 export SCRIPTNAME=$(basename "$0")
 
+#First run Service Name
+export FIRSTRUN_SERVICENAME="setup-system.service"
+export FIRSTRUN_SCRIPTPATH="/usr/lib/systemd/system"
+
 # temp and log files
 TEMPDIR="${HOME}/temp/system_setup"
 LOGFILE="${TEMPDIR}/${SCRIPTNAME}.log"

system_setup/setup_system.inc.sh

@@ -14,6 +14,10 @@
 #    fi
 #    return 0
 #}
+if [ ! -f $(pwd)/setup_system.conf ]; then
+    echo "System configuration not found. Please make a copy of setup_system.conf.dist, name it setup_system.conf and check the settings in it before running."
+    exit 1
+fi
 source $(pwd)/setup_system.conf
 
 #Check if the Data- Directory is encrypted

system_setup/sync_client_software.sh

@@ -28,9 +28,8 @@ fi
 
 echo "Syncing central softwarerepository ${CLIENT_SOFTWARE_DST}"
 # Create Directory if not existent
-if [ ! -d ${CLIENT_SOFTWARE_DST} ]; then
-    mkdir ${CLIENT_SOFTWARE_DST}
-fi
+mkdir -p ${CLIENT_SOFTWARE_DST}
+mkdir -p ${CLIENT_SOFTWARE_DST}/source
 
 #Logs for systems software-repository go to roots log files
 LOGFILE="${TEMPDIR}/${SCRIPTNAME}.log"
@@ -44,8 +43,6 @@ echo "Update or install Nextcloud client"
 #Sync Files
 SYNCCMD="sudo -i /usr/bin/flatpak run --branch=stable --arch=x86_64 --command=nextcloudcmd com.nextcloud.desktopclient.nextcloud -h -u ${DAVTOKEN_USER} -p ${DAVTOKEN_PASS} --path ${CLIENT_SOFTWARE_SRC} ${CLIENT_SOFTWARE_DST}/source https://${SERVERFQDN_NC}"
 SYNCCMD_HIDDENPW=$( echo "${SYNCCMD/${DAVTOKEN_PASS}/***HIDDEN***}" )
-mkdir -p ${CLIENT_SOFTWARE_SRC}
-mkdir -p ${CLIENT_SOFTWARE_SRC}/source
 chown root:${CLIENTADMINGROUP} -R ${CLIENT_SOFTWARE_DST}
 chmod ug+rw,o-rwx -R ${CLIENT_SOFTWARE_DST}
 echo "Exec: ${SYNCCMD_HIDDENPW}"