From 16de7c94da77805058409b21cc22794d16760856 Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 6 May 2023 05:44:19 +0200 Subject: [PATCH 1/2] cleanup/ whitespace --- scripts/backup_garrus.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup_garrus.sh b/scripts/backup_garrus.sh index 530bea3..aac6f07 100755 --- a/scripts/backup_garrus.sh +++ b/scripts/backup_garrus.sh @@ -9,12 +9,12 @@ shopt -s expand_aliases # make aliases work ### update local backup dir ### ############################### -# first part is still kind of manual for now... BACKUP_DIR=/sync/backup BACKUP_DIR_HOME=$BACKUP_DIR/home if [[ !($HOME/.bash_aliases_local -ef $BACKUP_DIR_HOME/.bash_aliases_local) ]]; then ln $HOME/.bash_aliases_local $BACKUP_DIR_HOME/.bash_aliases_local fi + BACKUP_DIR_ROOT=$BACKUP_DIR/root/etc rsync_backup --link-dest="/etc/ssh/" /etc/ssh/ $BACKUP_DIR_ROOT/ssh/ if [[ !(-d $BACKUP_DIR_ROOT/udev/rules.d) ]]; then From 1acf2a2305358037dd2b97eecd78efdf29f73ddb Mon Sep 17 00:00:00 2001 From: fabian Date: Sat, 6 May 2023 05:44:49 +0200 Subject: [PATCH 2/2] updated other sync files --- scripts/backup_edi.sh | 35 ++++++++++++++++++++++++++++++++--- scripts/backup_shepard.sh | 24 ++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/backup_shepard.sh diff --git a/scripts/backup_edi.sh b/scripts/backup_edi.sh index 111f377..bbb8e98 100755 --- a/scripts/backup_edi.sh +++ b/scripts/backup_edi.sh @@ -1,10 +1,39 @@ #!/usr/bin/env bash set -euo pipefail +source /sync/home_external/.bash_aliases shopt -s expand_aliases # make aliases work -REL_HOME=$HOME -source $REL_HOME/.bash_aliases -sd rsync_backup -e "ssh -i $REL_HOME/.ssh/id_ed25519" ./ fabian@garrus:/citadel/backup/edi/ + +############################### +### update local backup dir ### +############################### + +BACKUP_DIR=/sync/backup +BACKUP_DIR_HOME=$BACKUP_DIR/home +if [[ !($HOME/.bash_aliases_local -ef $BACKUP_DIR_HOME/.bash_aliases_local) ]]; then + ln $HOME/.bash_aliases_local $BACKUP_DIR_HOME/.bash_aliases_local +fi +rsync_backup --link-dest="$HOME/.ssh/" $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/ + +BACKUP_DIR_ROOT=$BACKUP_DIR/root/etc +rsync_backup --link-dest="/etc/ddclient/" /etc/ddclient/ $BACKUP_DIR_ROOT/ddclient/ +rsync_backup --link-dest="/etc/letsencrypt/" /etc/letsencrypt/ $BACKUP_DIR_ROOT/letsencrypt/ +rsync_backup --link-dest="/etc/nginx/" /etc/nginx/ $BACKUP_DIR_ROOT/nginx/ +rsync_backup --link-dest="/etc/ssh/" /etc/ssh/ $BACKUP_DIR_ROOT/ssh/ +rsync_backup --link-dest="/etc/wireguard/" /etc/wireguard/ $BACKUP_DIR_ROOT/wireguard/ +if [[ !(/etc/ddclient.conf -ef $BACKUP_DIR_ROOT/ddclient.conf) ]]; then + ln /etc/ddclient.conf $BACKUP_DIR_ROOT/ddclient.conf +fi + + +##################### +### upload backup ### +##################### + +rsync_backup $BACKUP_DIR/ fabian@garrus:/citadel/backup/shepard/ + +sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" /sync/backup/ fabian@garrus:/citadel/backup/edi/ +sd rsync_backup -e "ssh -i /home/edi/.ssh/id_ed25519" /home/edi/docker/ fabian@garrus:/citadel/backup/edi/home/docker/ sd rsync_backup --link-dest="/etc/ssh/" /etc/ssh/ ssh/ diff --git a/scripts/backup_shepard.sh b/scripts/backup_shepard.sh old mode 100644 new mode 100755 index e69de29..84d9b1f --- a/scripts/backup_shepard.sh +++ b/scripts/backup_shepard.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -euo pipefail + +source /sync/home_external/.bash_aliases +shopt -s expand_aliases # make aliases work + + +############################### +### update local backup dir ### +############################### + +BACKUP_DIR=/sync/backup +BACKUP_DIR_HOME=$BACKUP_DIR/home +if [[ !($HOME/.bash_aliases_local -ef $BACKUP_DIR_HOME/.bash_aliases_local) ]]; then + ln $HOME/.bash_aliases_local $BACKUP_DIR_HOME/.bash_aliases_local +fi +rsync_backup --link-dest="$HOME/.ssh/" $HOME/.ssh/ $BACKUP_DIR_HOME/.ssh/ + + +##################### +### upload backup ### +##################### + +sd rsync_backup -e "ssh -i /home/fabian/.ssh/id_ed25519" $BACKUP_DIR/ fabian@garrus:/citadel/backup/shepard/