From b1af32e4e7b46fd458c8e1775748a85a8fac0f12 Mon Sep 17 00:00:00 2001 From: Jakub Czajka Date: Sun, 3 Dec 2023 12:23:53 +0100 Subject: [PATCH] Replace hardcoded paths with environment variables. --- backup.service | 7 ++++--- notify_failure@.service | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backup.service b/backup.service index a3adff8..7243a16 100644 --- a/backup.service +++ b/backup.service @@ -7,12 +7,13 @@ OnFailure=notify_failure@%n.service [Service] Type=oneshot +EnvironmentFile=/etc/ansible/facts.d/env.fact ExecStartPre=/usr/bin/git \ --work-tree=/tmp \ - --git-dir=/srv/git/turnup.git \ + --git-dir=${git_home_dir}/turnup.git \ checkout main --force sources.yaml backup.yaml ExecStart=/usr/bin/ansible-playbook /tmp/backup.yaml \ --connection=local \ - --extra-vars token=/srv/prod/gdrive_proxy/token.json \ - --extra-vars key=/srv/prod/gdrive_proxy/private/storage_drive.key \ + --extra-vars token=${gdrive_auth_token} \ + --extra-vars key=${gdrive_encryption_key} \ --extra-vars sources=/tmp/sources.yaml diff --git a/notify_failure@.service b/notify_failure@.service index 4a67097..c0c1818 100644 --- a/notify_failure@.service +++ b/notify_failure@.service @@ -6,9 +6,10 @@ Description=Notify about failure through an email notification. [Service] Type=oneshot +EnvironmentFile=/etc/ansible/facts.d/env.fact ExecStartPre=/usr/bin/git \ --work-tree=/tmp \ - --git-dir=/srv/git/cron.git \ + --git-dir=${git_home_dir}/cron.git \ checkout main --force notify_on_failure.sh ExecStart=/tmp/notify_on_failure.sh %I -- 2.39.5