Merge remote-tracking branch 'origin/master' into debian

scripts/backup_edi.sh

@@ -5,28 +5,6 @@ source /sync/home_external/.bash_aliases
 shopt -s expand_aliases # make aliases work
 
 
-###############################
-### update local backup dir ###
-###############################
-
-BACKUP_DIR=/sync/backup
-ensureDirectory $BACKUP_DIR
-BACKUP_DIR_HOME=$BACKUP_DIR/home
-ensureDirectory $BACKUP_DIR_HOME
-backupDirectory $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
-
-BACKUP_DIR_ROOT=$BACKUP_DIR/root/etc
-ensureRootDirectory $BACKUP_DIR_ROOT
-sd rsync_backup /etc/hosts $BACKUP_DIR_ROOT/
-sd rsync_backup /etc/ddclient.conf $BACKUP_DIR_ROOT/
-backupRootDirectory /etc/ddclient/ $BACKUP_DIR_ROOT/ddclient/
-backupRootDirectory /etc/letsencrypt/ $BACKUP_DIR_ROOT/letsencrypt/
-backupRootDirectory /etc/nginx/ $BACKUP_DIR_ROOT/nginx/
-backupRootDirectory /etc/ssh/ $BACKUP_DIR_ROOT/ssh/
-backupRootDirectory /etc/wireguard/ $BACKUP_DIR_ROOT/wireguard/
-backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/
-
-
 backupRootDirectory() {
    ensureRootDirectory $2
    sd rsync_backup $1 $2
@@ -51,6 +29,27 @@ ensureDirectory() {
    fi
 }
 
+###############################
+### update local backup dir ###
+###############################
+
+BACKUP_DIR=/sync/backup
+ensureDirectory $BACKUP_DIR
+BACKUP_DIR_HOME=$BACKUP_DIR/home
+ensureDirectory $BACKUP_DIR_HOME
+backupDirectory $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/
+
+BACKUP_DIR_ROOT=$BACKUP_DIR/root/etc
+ensureRootDirectory $BACKUP_DIR_ROOT
+sd rsync_backup /etc/hosts $BACKUP_DIR_ROOT/
+sd rsync_backup /etc/ddclient.conf $BACKUP_DIR_ROOT/
+backupRootDirectory /etc/ddclient/ $BACKUP_DIR_ROOT/ddclient/
+backupRootDirectory /etc/letsencrypt/ $BACKUP_DIR_ROOT/letsencrypt/
+backupRootDirectory /etc/nginx/ $BACKUP_DIR_ROOT/nginx/
+backupRootDirectory /etc/ssh/ $BACKUP_DIR_ROOT/ssh/
+backupRootDirectory /etc/wireguard/ $BACKUP_DIR_ROOT/wireguard/
+backupRootDirectory /etc/docker/daemon.json $BACKUP_DIR_ROOT/docker/
+
 #####################
 ### upload backup ###
 #####################