diff --git a/group_vars/all/borg.yml b/group_vars/all/borg.yml index ecfc94401fd9d5180727d54c4b2a4c8bc9f3cb49..e719aab183b6843008596ee50fd5f3afbcdcfe78 100644 --- a/group_vars/all/borg.yml +++ b/group_vars/all/borg.yml @@ -1,5 +1,7 @@ --- glob_borg: + to_exclude: + - /var/lib/lxcfs to_backup: - /etc - /var diff --git a/host_vars/cameron.adm.crans.org b/host_vars/cameron.adm.crans.org index f209ba881659fb1b65cb948538201a0f6eda6708..f68e04f9f23f910d7ecee2728671e244a11abac5 100644 --- a/host_vars/cameron.adm.crans.org +++ b/host_vars/cameron.adm.crans.org @@ -2,11 +2,4 @@ loc_borg: to_exclude: - /var/mail - -loc_borg_data: - path_suffix: ".data" - to_backup: - - /var/mail - - /pool/home - remote: - - borg@omnomnom.adm.crans.org:/backup/borg/{{ ansible_hostname }} + - /var/lib/lxcfs diff --git a/host_vars/daniel.adm.crans.org.yml b/host_vars/daniel.adm.crans.org.yml index c759e0ab6ff46eda36a25f52eb2d78f6229892a3..b26e6fbcbcafcf67e031615e319a07eec95e275f 100644 --- a/host_vars/daniel.adm.crans.org.yml +++ b/host_vars/daniel.adm.crans.org.yml @@ -8,7 +8,3 @@ loc_postgres: version: 11 replica: yes addresses: "['daniel.adm.crans.org'] + {{ query('ldap', 'ip', 'daniel', 'adm') | ipaddr('address') }}" - -loc_borg: - to_exclude: - - /var/lib/lxcfs diff --git a/host_vars/gulp.cachan-adm.crans.org.yml b/host_vars/gulp.cachan-adm.crans.org.yml index 63918af1c4cca9310765bfbc2db387689969b192..c972869b0f7f7dd92a8aea5d1c7efaeafb31a06f 100644 --- a/host_vars/gulp.cachan-adm.crans.org.yml +++ b/host_vars/gulp.cachan-adm.crans.org.yml @@ -25,8 +25,6 @@ loc_postgres: loc_borg: remote: - borg@zephir.cachan-adm.crans.org:/backup/borg/{{ ansible_hostname }} - to_exclude: - - /var/lib/lxcfs ssh_options: "" glob_prometheus_node_exporter: diff --git a/host_vars/jack.adm.crans.org.yml b/host_vars/jack.adm.crans.org.yml index 38e384d9fd3a3a13d268bf4244e9bcb3f4058d0e..df66cd826bd026ef22d84fd0cd10cc2588de633a 100644 --- a/host_vars/jack.adm.crans.org.yml +++ b/host_vars/jack.adm.crans.org.yml @@ -8,7 +8,3 @@ loc_postgres: version: 11 replica: yes addresses: "['jack.adm.crans.org'] + {{ query('ldap', 'ip', 'jack', 'adm') | ipaddr('address') }}" - -loc_borg: - to_exclude: - - /var/lib/lxcfs diff --git a/host_vars/owl.adm.crans.org.yml b/host_vars/owl.adm.crans.org.yml index 077e56c27d2a75caa75b98501bdfd4686e5703e1..b5d9a4a5cbdbe84ba0c76167cd792cdb7ed1ebd5 100644 --- a/host_vars/owl.adm.crans.org.yml +++ b/host_vars/owl.adm.crans.org.yml @@ -9,3 +9,4 @@ loc_dovecot: loc_borg: to_exclude: - /var/mail + - /var/lib/lxcfs diff --git a/host_vars/sam.adm.crans.org.yml b/host_vars/sam.adm.crans.org.yml index 6128448d754be59b3b8418c935cd4c753d2ebbb7..0f4a5c1f8bd043da5efd5ce0a9fc16bd0967ac10 100644 --- a/host_vars/sam.adm.crans.org.yml +++ b/host_vars/sam.adm.crans.org.yml @@ -8,7 +8,3 @@ loc_postgres: version: 11 replica: yes addresses: "['sam.adm.crans.org'] + {{ query('ldap', 'ip', 'sam', 'adm') | ipaddr('address') }}" - -loc_borg: - to_exclude: - - /var/lib/lxcfs diff --git a/host_vars/zamok.adm.crans.org.yml b/host_vars/zamok.adm.crans.org.yml index 342eb77f09cf094da94c30bbaf4f6fd4ebf04192..004601da74a94030a3c8bc3cbbb4757fa1af7365 100644 --- a/host_vars/zamok.adm.crans.org.yml +++ b/host_vars/zamok.adm.crans.org.yml @@ -3,6 +3,7 @@ loc_borg: to_exclude: - /var/mail - /var/lib/podman + - /var/lib/lxcfs hooks: - type: mysql_databases params: diff --git a/host_vars/zephir.cachan-adm.crans.org.yml b/host_vars/zephir.cachan-adm.crans.org.yml index f954d343ae332b0aeb82f8ce0d5f7718d6729738..8696c084016a85837c719b530fae32128d389092 100644 --- a/host_vars/zephir.cachan-adm.crans.org.yml +++ b/host_vars/zephir.cachan-adm.crans.org.yml @@ -23,6 +23,7 @@ loc_borg: ssh_options: "" to_exclude: - /var/lib/backuppc + - /var/lib/lxcfs glob_prometheus_node_exporter: listen_addr: "{{ query('ldap', 'ip', ansible_hostname, 'cachan-adm') | ipv4 | first }}"