diff --git a/group_vars/all/borg.yml b/group_vars/all/borg.yml index ecfc9440..e719aab1 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 f209ba88..f68e04f9 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 c759e0ab..b26e6fbc 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 63918af1..c972869b 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 38e384d9..df66cd82 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 077e56c2..b5d9a4a5 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 6128448d..0f4a5c1f 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 342eb77f..004601da 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 f954d343..8696c084 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 }}"