diff options
Diffstat (limited to 'src/infrastructure/guix/system.scm')
| -rw-r--r-- | src/infrastructure/guix/system.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/infrastructure/guix/system.scm b/src/infrastructure/guix/system.scm index e506de8..a6093a9 100644 --- a/src/infrastructure/guix/system.scm +++ b/src/infrastructure/guix/system.scm @@ -88,7 +88,7 @@ HOSTNAME="$(hostname)" export BORG_REPO="16686@ch-s010.rsync.net:borg/$HOSTNAME" export BORG_REMOTE_PATH='borg1' - export BORG_PASSCOMMAND='cat /opt/secrets/borg-passphrase.txt' + export BORG_PASSCOMMAND='cat /var/lib/borg-passphrase.txt' export GIT_CONFIG_GLOBAL=/etc/gitconfig @@ -207,10 +207,12 @@ ARCHIVE_TAG="${1:-manual}" + export BORG_RSH="ssh -i $HOME/.ssh/id_rsa" + run() { set -x # shellcheck disable=2086 - sudo -i borg create \ + sudo -E borg create \ $VERBOSE_FLAGS \ --comment " $COMMENT" \ --stats \ @@ -220,8 +222,7 @@ /home/ \ /etc/ \ /var/ \ - /srv/ \ - /opt/ + /srv/ STATUS=$? set +x @@ -1668,7 +1669,7 @@ (name whoami) (comment "EuAndreh") (group "users") - (supplementary-groups '("wheel"))) + (supplementary-groups '("wheel" "borg"))) (user-account (name "git") (group "git") @@ -1681,6 +1682,8 @@ (append (list (user-group + (name "borg")) + (user-group (name "git"))) %base-groups)) (sudoers-file |