crans
/
ansible
mirror of http://gitlab.adm.crans.org/nounous/ansible.git
19
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'codimd' into 'newinfra' 

Add support for bullseye and add codichotomie

See merge request nounous/ansible!122
certbot_on_virtu
erdnaxe 2020-12-23 12:18:47 +01:00
parent 7610cd3c7c cb7952bd2d
commit d17968e246
6 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/reverseproxy.yml
View File

@ -56,6 +56,7 @@ nginx:
- {from: zero.crans.org, to: 172.16.10.130} - {from: zero.crans.org, to: 172.16.10.130}
- {from: ethercalc.crans.org, to: "172.16.10.133:8000"} - {from: ethercalc.crans.org, to: "172.16.10.133:8000"}
- {from: roundcube.crans.org, to: 172.16.10.107} - {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: belenios.crans.org, to: 172.16.10.111}
# - {from: mailman.crans.org, to: 10.231.136.180} # - {from: mailman.crans.org, to: 10.231.136.180}
# #

3
host_vars/codichotomie.adm.crans.org.yml 100644
View File

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

1
hosts
View File

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

2
plays/network-interfaces.yml
View File

@ -1,6 +1,6 @@
#!/usr/bin/env ansible-playbook #!/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: vars:
vlan: vlan:
- name: srv - name: srv

3
roles/debian-apt-sources/templates/apt/sources.list.j2
View File

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

3
roles/nullmailer/tasks/main.yml
View File

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