summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/borg/tasks/main.yml1
-rw-r--r--roles/common/files/docker-compose@.service2
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/borg/tasks/main.yml b/roles/borg/tasks/main.yml
index fd3be99..694290d 100644
--- a/roles/borg/tasks/main.yml
+++ b/roles/borg/tasks/main.yml
@@ -18,6 +18,7 @@
borg_ssh_command: "ssh -o StrictHostKeyChecking=no -i {{ borg_ssh_key }}"
borg_source_directories:
"{{ base_files + (extra_files[inventory_hostname] | default([])) }}"
+ borgmatic_relocated_repo_access_is_ok: True
borg_retention_policy:
keep_hourly: 3
keep_daily: 7
diff --git a/roles/common/files/docker-compose@.service b/roles/common/files/docker-compose@.service
index bc2fbcc..ca157e3 100644
--- a/roles/common/files/docker-compose@.service
+++ b/roles/common/files/docker-compose@.service
@@ -9,7 +9,7 @@ Restart=always
RestartSec=3
RemainAfterExit=true
WorkingDirectory=/etc/docker/compose/%i
-ExecStartPre=/usr/bin/docker compose pull
+ExecStartPre=/bin/bash -c "/usr/bin/docker compose pull || true"
ExecStart=/usr/bin/docker compose up --detach --remove-orphans
ExecStop=/usr/bin/docker compose down