Replace hardcoded paths with environment variables.

diff --git a/backup.service b/backup.service
index a3adff84072e79dd037bf9fe25445b2029085315..7243a16ee8a9ddfce61b1db399ca17de0faf2cc4 100644 (file)
--- 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 4a670976e52cc4feff83d2c728717cfa0c227c62..c0c18187a609f3ebde143793e7732dd5126abc03 100644 (file)
--- 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