From b6bc40af2bcb56027d9b7a8152d9a25fc673e383 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Sun, 4 Feb 2024 11:51:51 +0100
Subject: [PATCH] ansible/roles/borgbackup#4 Update borgmatic configuration
---
tasks/app.yml | 1 +
tasks/config.yml | 3 ++-
tasks/config_drupal.yml | 3 ++-
tasks/config_nextcloud.yml | 3 ++-
tasks/config_other.yml | 3 ++-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tasks/app.yml b/tasks/app.yml
index 6f6ca26..c5a27c0 100644
--- a/tasks/app.yml
+++ b/tasks/app.yml
@@ -44,6 +44,7 @@
src: app.yaml
dest: '{{ application_root }}/borgconfig/config.yaml'
mode: 0600
+ when: ansible_distribution_major_version != '18'
- name: Crontabs
copy:
diff --git a/tasks/config.yml b/tasks/config.yml
index df79380..5dddbc1 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -17,6 +17,7 @@
mode: 0600
notify:
- Init Borgs
+ when: ansible_distribution_major_version != '18'
- name: Add Borgmatic Check
template:
@@ -25,7 +26,7 @@
mode: 0600
notify:
- Init Borgs
- when: not borgbackup.disable_local|default(false)
+ when: not borgbackup.disable_local|default(false) and ansible_distribution_major_version != '18'
- name: Add Borgmatic Configuration for Drupal
include_tasks: config_drupal.yml
diff --git a/tasks/config_drupal.yml b/tasks/config_drupal.yml
index 061457c..c13048d 100644
--- a/tasks/config_drupal.yml
+++ b/tasks/config_drupal.yml
@@ -42,6 +42,7 @@
mode: 0600
notify:
- Init Borgs
+ when: ansible_distribution_major_version != '18'
- name: Configure Drupal Check
template:
@@ -50,7 +51,7 @@
mode: 0600
notify:
- Init Borgs
- when: not application_disable_local|default(false)
+ when: not application_disable_local|default(false) and ansible_distribution_major_version != '18'
- name: Add repo server host key to known hosts
known_hosts:
diff --git a/tasks/config_nextcloud.yml b/tasks/config_nextcloud.yml
index 474c7b3..69dd8e1 100644
--- a/tasks/config_nextcloud.yml
+++ b/tasks/config_nextcloud.yml
@@ -33,6 +33,7 @@
mode: 0600
notify:
- Init Borgs
+ when: ansible_distribution_major_version != '18'
- name: Configure Nextcloud Check
template:
@@ -41,7 +42,7 @@
mode: 0600
notify:
- Init Borgs
- when: not application_disable_local|default(false)
+ when: not application_disable_local|default(false) and ansible_distribution_major_version != '18'
- name: Add repo server host key to known hosts
known_hosts:
diff --git a/tasks/config_other.yml b/tasks/config_other.yml
index 9da728a..46500f5 100644
--- a/tasks/config_other.yml
+++ b/tasks/config_other.yml
@@ -26,6 +26,7 @@
mode: 0600
notify:
- Init Borgs
+ when: ansible_distribution_major_version != '18'
- name: Configure Other Check
template:
@@ -34,7 +35,7 @@
mode: 0600
notify:
- Init Borgs
- when: not application_disable_local|default(false)
+ when: not application_disable_local|default(false) and ansible_distribution_major_version != '18'
- name: Add repo server host key to known hosts
known_hosts:
--
GitLab