Merge branch 'codimd' into 'newinfra'

Add support for bullseye and add codichotomie

See merge request nounous/ansible!122

group_vars/reverseproxy.yml

@@ -56,6 +56,7 @@ nginx:
     - {from: zero.crans.org, to: 172.16.10.130}
     - {from: ethercalc.crans.org, to: "172.16.10.133:8000"}
     - {from: roundcube.crans.org, to: 172.16.10.107}
+    - {from: codimd.crans.org, to: "172.16.10.128:3000"}
     # - {from: belenios.crans.org, to: 172.16.10.111}
     #    - {from: mailman.crans.org, to: 10.231.136.180}
     #

host_vars/codichotomie.adm.crans.org.yml

@@ -0,0 +1,3 @@
+interfaces:
+  adm: eth0
+  srv_nat: eth1

hosts

@@ -91,6 +91,7 @@ jack.adm.crans.org
 zephir.adm.crans.org
 
 [crans_vm]
+codichotomie.adm.crans.org
 voyager.adm.crans.org
 #silice.adm.crans.org
 routeur-sam.adm.crans.org

plays/network-interfaces.yml

@@ -1,6 +1,6 @@
 #!/usr/bin/env ansible-playbook
 ---
-- hosts: voyager.adm.crans.org,boeing.adm.crans.org,fluxx.adm.crans.org,hodaur.adm.crans.org,unifi.adm.crans.org,kiwi.adm.crans.org,roundcube.adm.crans.org,monitoring.adm.crans.org,bigbluebutton.adm.crans.org
+- hosts: voyager.adm.crans.org,boeing.adm.crans.org,fluxx.adm.crans.org,hodaur.adm.crans.org,unifi.adm.crans.org,kiwi.adm.crans.org,roundcube.adm.crans.org,monitoring.adm.crans.org,bigbluebutton.adm.crans.org,codichotomie.adm.crans.org
   vars:
     vlan:
       - name: srv

roles/debian-apt-sources/templates/apt/sources.list.j2

@@ -1,9 +1,12 @@
 {{ ansible_header | comment }}
 
 {% if ansible_lsb.id == "Debian" %}
+{% if ansible_lsb.codename != "bullseye" %}
+{# Debian security does not exist yet for bullseye #}
 # Mises à jour de sécurité
 deb     {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates {{ debian_components }}
 
+{% endif %}
 # Dépôt classique
 deb     {{ debian_mirror }} {{ ansible_lsb.codename }} {{ debian_components }}
 

roles/nullmailer/tasks/main.yml

@@ -13,13 +13,16 @@
   copy:
     content: "{{ mail_smtp_server }} smtp\n"
     dest: /etc/nullmailer/remotes
+    mode: 0644
 
 - name: Set nullmailer adminaddr
   copy:
     content: "{{ mail_root }}\n"
     dest: /etc/nullmailer/adminaddr
+    mode: 0644
 
 - name: Set nullmailer defaulthost
   copy:
     content: "{{ mail_defaulthost }}\n"
     dest: /etc/nullmailer/defaulthost
+    mode: 0644