diff --git a/borg/tasks/main.yml b/borg/tasks/main.yml index fbf1f49..4ff2e37 100644 --- a/borg/tasks/main.yml +++ b/borg/tasks/main.yml @@ -18,6 +18,7 @@ borg_group: "{{ borg_my_group }}" borgmatic_timer: cron borg_ssh_command: "ssh -o StrictHostKeyChecking=no -i {{ borg_ssh_key }}" + borgmatic_relocated_repo_access_is_ok: true borg_source_directories: "{{ base_files + (extra_files[inventory_hostname] | default([])) }}" borg_retention_policy: diff --git a/group_vars/all.yml b/group_vars/all.yml index 7957e23..e31cc71 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,11 +1,10 @@ --- dns_servers: - - 1.1.1.1 - - 1.0.0.1 + - 10.155.0.1 dns_domains: - - ["hatecomputers.club"] -dns_dnssec: true + - hatecomputers.club +dns_dnssec: false dns_stub_listener: false rfc1918_networks: diff --git a/playbooks/roles/docker/files/docker-compose@.service b/playbooks/roles/docker/files/docker-compose@.service index bd8dedb..6a6314c 100644 --- a/playbooks/roles/docker/files/docker-compose@.service +++ b/playbooks/roles/docker/files/docker-compose@.service @@ -6,7 +6,7 @@ After=docker.service [Service] RemainAfterExit=true WorkingDirectory=/etc/docker/compose/%i -ExecStartPre=/usr/bin/docker compose pull +ExecStartPre=/bin/bash -c "/usr/bin/docker compose pull || /bin/test" ExecStart=/usr/bin/docker compose up --detach --remove-orphans ExecStop=/usr/bin/docker compose down Restart=always