update

defaults.inc

@@ -1,18 +1,8 @@
 #!/usr/bin/env bash
-VERS='4.13.36-11142023'
+VERS='4.14.4-11142023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update '
 CERT_DAEMON='/snap/bin/certbot'
-NM_FOLDER=/opt/idssys/nodemgmt
-NM_SCRIPT=${NM_FOLDER}/nodemgmt-scripts.sh
-NM_TMPFOLDER=${NM_FOLDER}/.tmp
-NM_LOGFOLDER=${NM_FOLDER}/logs
-NM_LOGFILE=${NM_LOGFOLDER}/logfile
-
-RENOTIFY_TIMEOUT=3600
-
-[ ! -d ${NM_TMPFOLDER} ] && mkdir ${NM_TMPFOLDER}
-[ ! -d ${NM_LOGFOLDER} ] && mkdir ${NM_LOGFOLDER}
 
 declare -i errtime
 
@@ -38,7 +28,19 @@ if [ -f ${NM_FOLDER}/conf/defaults.local.inc ]; then
 	declare -A NM_WWWPATHS
 	
 	source ${NM_FOLDER}/conf/defaults.local.inc
+	
+	[ "${NM_FOLDER}" == "" ] && NM_FOLDER=/opt/idssys/nodemgmt
+	[ "${NM_BACKUP_FOLDER}" == "" ] && NM_BACKUP_FOLDER=/opt/idssys/backups/node-backup
+	NM_SCRIPT=${NM_FOLDER}/nodemgmt-scripts.sh
+	NM_TMPFOLDER=${NM_FOLDER}/.tmp
+	[ "${NM_LOGFOLDER}" == "" ] && NM_LOGFOLDER=${NM_FOLDER}/logs
+	NM_LOGFILE=${NM_LOGFOLDER}/logfile
+	
+	[ ! -d ${NM_TMPFOLDER} ] && mkdir ${NM_TMPFOLDER}
+	[ ! -d ${NM_LOGFOLDER} ] && mkdir ${NM_LOGFOLDER}
 
+	[ "${NM_RENOTIFY_TIMEOUT}" == "" ] && NM_RENOTIFY_TIMEOUT=3600
+	
 	IFS=,
 	LOCAL_SERVICES=(${LOCAL_SERVICES})
 	unset IFS