Skip to content
Snippets Groups Projects
Commit cbcbce11 authored by Maxime Bombar's avatar Maxime Bombar
Browse files

Merge branch 'update_hosts' into 'newinfra'

configure re2o-ldap and re2o-dev

See merge request !186
parents 188611c3 32e0c220
No related branches found
No related tags found
1 merge request!186configure re2o-ldap and re2o-dev
---
backports: true
...@@ -147,8 +147,9 @@ kiwijuice.adm.crans.org ...@@ -147,8 +147,9 @@ kiwijuice.adm.crans.org
monitoring.adm.crans.org monitoring.adm.crans.org
owl.adm.crans.org owl.adm.crans.org
owncloud.adm.crans.org owncloud.adm.crans.org
#re2o-ldap.adm.crans.org
re2o.adm.crans.org re2o.adm.crans.org
re2o-dev.adm.crans.org
re2o-ldap.adm.crans.org
redisdead.adm.crans.org redisdead.adm.crans.org
roundcube.adm.crans.org roundcube.adm.crans.org
#silice.adm.crans.org #silice.adm.crans.org
...@@ -299,6 +300,11 @@ crans_vm ...@@ -299,6 +300,11 @@ crans_vm
crans_server crans_server
ovh ovh
# because we live in the past
[stretch]
re2o-ldap.adm.crans.org
jitsi.adm.crans.org
[all:vars] [all:vars]
# Force remote to use Python 3 # Force remote to use Python 3
ansible_python_interpreter=/usr/bin/env python3 ansible_python_interpreter=/usr/bin/env python3
#!/usr/bin/env ansible-playbook #!/usr/bin/env ansible-playbook
--- ---
- hosts: server - hosts: server,!stretch
vars: vars:
borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}' borg: '{{ glob_borg | default({}) | combine(loc_borg | default({})) }}'
mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}' mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
......
...@@ -12,6 +12,12 @@ deb {{ debian_mirror }} {{ ansible_distribution_release }} {{ debian_compone ...@@ -12,6 +12,12 @@ deb {{ debian_mirror }} {{ ansible_distribution_release }} {{ debian_compone
# Dépôt pour mises à jour fréquentes (volatile) # Dépôt pour mises à jour fréquentes (volatile)
deb {{ debian_mirror }} {{ ansible_distribution_release }}-updates {{ debian_components }} 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" %} {% elif ansible_distribution == "Ubuntu" %}
# Mises à jour de sécurité # Mises à jour de sécurité
deb {{ ubuntu_mirror }} {{ ansible_distribution_release }}-security {{ ubuntu_components }} deb {{ ubuntu_mirror }} {{ ansible_distribution_release }}-security {{ ubuntu_components }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment