From 32e0c220f05fd7bb7587ad0cd0fe710d60f03866 Mon Sep 17 00:00:00 2001 From: Maxime Bombar <bombar@crans.org> Date: Sun, 10 Jan 2021 13:50:38 +0100 Subject: [PATCH] configure re2o-ldap and re2o-dev --- host_vars/re2o-ldap.adm.crans.org.yml | 2 ++ hosts | 8 +++++++- plays/borgbackups_client.yml | 2 +- roles/debian-apt-sources/templates/apt/sources.list.j2 | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 host_vars/re2o-ldap.adm.crans.org.yml diff --git a/host_vars/re2o-ldap.adm.crans.org.yml b/host_vars/re2o-ldap.adm.crans.org.yml new file mode 100644 index 00000000..71431fa6 --- /dev/null +++ b/host_vars/re2o-ldap.adm.crans.org.yml @@ -0,0 +1,2 @@ +--- +backports: true diff --git a/hosts b/hosts index 4c34f676..98de0fe4 100644 --- a/hosts +++ b/hosts @@ -147,8 +147,9 @@ kiwijuice.adm.crans.org monitoring.adm.crans.org owl.adm.crans.org owncloud.adm.crans.org -#re2o-ldap.adm.crans.org re2o.adm.crans.org +re2o-dev.adm.crans.org +re2o-ldap.adm.crans.org redisdead.adm.crans.org roundcube.adm.crans.org #silice.adm.crans.org @@ -299,6 +300,11 @@ crans_vm crans_server ovh +# because we live in the past +[stretch] +re2o-ldap.adm.crans.org +jitsi.adm.crans.org + [all:vars] # Force remote to use Python 3 ansible_python_interpreter=/usr/bin/env python3 diff --git a/plays/borgbackups_client.yml b/plays/borgbackups_client.yml index 1949a5ca..3d70452e 100755 --- a/plays/borgbackups_client.yml +++ b/plays/borgbackups_client.yml @@ -1,7 +1,7 @@ #!/usr/bin/env ansible-playbook --- -- hosts: server +- hosts: server,!stretch vars: borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}' mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}' diff --git a/roles/debian-apt-sources/templates/apt/sources.list.j2 b/roles/debian-apt-sources/templates/apt/sources.list.j2 index 8b54c769..87b2cab2 100644 --- a/roles/debian-apt-sources/templates/apt/sources.list.j2 +++ b/roles/debian-apt-sources/templates/apt/sources.list.j2 @@ -12,6 +12,12 @@ deb {{ debian_mirror }} {{ ansible_distribution_release }} {{ debian_compone # Dépôt pour mises à jour fréquentes (volatile) deb {{ debian_mirror }} {{ ansible_distribution_release }}-updates {{ debian_components }} + +{% if backports | default(false) %} +# Backports +deb {{ debian_mirror }} {{ ansible_distribution_release }}-backports {{ debian_components }} +{% endif %} + {% elif ansible_distribution == "Ubuntu" %} # Mises à jour de sécurité deb {{ ubuntu_mirror }} {{ ansible_distribution_release }}-security {{ ubuntu_components }} -- GitLab