Merge branch 'update_hosts' into 'newinfra'

configure re2o-ldap and re2o-dev

See merge request nounous/ansible!186

host_vars/re2o-ldap.adm.crans.org.yml

@@ -0,0 +1,2 @@
+---
+backports: true

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

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({})) }}'

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 }}