diff --git a/bdd.yml b/bdd.yml index 7a0bf6c..f3fa7d3 100644 --- a/bdd.yml +++ b/bdd.yml @@ -1,7 +1,7 @@ #!/usr/bin/env ansible-playbook --- # Install and configure bdd servers at Saclay and at OVH -- hosts: bdd +- hosts: bdd,!re2o-bdd.adm.auro.re,!services-bdd-local.adm.auro.re roles: - postgresql_server ... diff --git a/group_vars/bdd.yml b/group_vars/bdd.yml new file mode 100644 index 0000000..8d71e6a --- /dev/null +++ b/group_vars/bdd.yml @@ -0,0 +1,3 @@ +--- +borg_keep_hourly: 6 +... diff --git a/host_vars/bdd.adm.auro.re.yml_bak b/host_vars/bdd.adm.auro.re.yml_bak new file mode 100644 index 0000000..206a504 --- /dev/null +++ b/host_vars/bdd.adm.auro.re.yml_bak @@ -0,0 +1,8 @@ +postgresql: + version: 13 + hosts: # dbname, username, CIDR ip addr, auth method + - [ "nextcloud", "nextcloud", "10.128.0.58", "md5" ] + - [ "gitea", "gitea", "10.128.0.60", "md5" ] + - [ "drone", "drone", "10.128.0.64", "md5" ] + - [ "wikijs", "wikijs", "10.128.0.66", "md5" ] + - [ "vote", "vote", "10.128.0.81", "md5" ] diff --git a/host_vars/caradoc.adm.auro.re.yml b/host_vars/caradoc.adm.auro.re.yml index 726532d..f6a66c2 100644 --- a/host_vars/caradoc.adm.auro.re.yml +++ b/host_vars/caradoc.adm.auro.re.yml @@ -5,6 +5,7 @@ borg_keep_weekly: 4 borg_keep_monthly: 12 borg_backup_directories: - "/etc/" + - "/var"/ - "/data_nextcloud" - "/data_gitea" - "/data_mail" diff --git a/host_vars/log.adm.auro.re.yml b/host_vars/log.adm.auro.re.yml index 1431ddd..42422ad 100644 --- a/host_vars/log.adm.auro.re.yml +++ b/host_vars/log.adm.auro.re.yml @@ -1,8 +1,4 @@ --- -borg_keep_hourly: 0 -borg_keep_daily: 7 -borg_keep_weekly: 4 -borg_keep_monthly: 12 borg_backup_directories: - "/etc/" - "/var/" diff --git a/hosts b/hosts index 7694175..9255734 100644 --- a/hosts +++ b/hosts @@ -29,7 +29,6 @@ stream.adm.auro.re re2o-server.adm.auro.re re2o-ldap.adm.auro.re re2o-db.adm.auro.re -#services-bdd-local.adm.auro.re backup.adm.auro.re mail.adm.auro.re wikijs.adm.auro.re @@ -39,6 +38,7 @@ jitsi-aurore.adm.auro.re bdd.adm.auro.re bdd-ovh.adm.auro.re litl.adm.auro.re +services-bdd-local.adm.auro.re [aurore_testing_vm] pendragon.adm.auro.re @@ -514,3 +514,5 @@ proxy.adm.auro.re [bdd] bdd.adm.auro.re bdd-ovh.adm.auro.re +services-bdd-local.adm.auro.re +re2o-bdd.adm.auro.re diff --git a/roles/borgbackup_client/defaults/main.yml b/roles/borgbackup_client/defaults/main.yml index 2550cdd..0ffec29 100644 --- a/roles/borgbackup_client/defaults/main.yml +++ b/roles/borgbackup_client/defaults/main.yml @@ -1,7 +1,8 @@ --- -borg_keep_daily: 7 -borg_keep_weekly: 4 -borg_keep_monthly: 12 +borg_keep_hourly: 0 +borg_keep_daily: 0 +borg_keep_weekly: 0 +borg_keep_monthly: 0 borg_server_user: borgbackup borg_server_group: borgbackup ... diff --git a/roles/borgbackup_client/templates/config.yaml.j2 b/roles/borgbackup_client/templates/config.yaml.j2 index c152168..396d1f0 100644 --- a/roles/borgbackup_client/templates/config.yaml.j2 +++ b/roles/borgbackup_client/templates/config.yaml.j2 @@ -23,9 +23,18 @@ storage: retention: - keep_daily: {{ borg_keep_daily }} - keep_weekly: {{ borg_keep_weekly }} - keep_monthly: {{ borg_keep_monthly }} + {% if borg_keep_hourly > 0 %} + - keep_hourly: {{ borg_keep_hourly }} + {% endif %} + {% if borg_keep_daily > 0 %} + - keep_hourly: {{ borg_keep_daily }} + {% endif %} + {% if borg_keep_weekly > 0 %} + - keep_hourly: {{ borg_keep_weekly }} + {% endif %} + {% if borg_keep_monthly > 0 %} + - keep_hourly: {{ borg_keep_monthly }} + {% endif %} consistency: checks: