From 57b72e53ccf41ae5812add4c57429e0f2d119f2d Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Thu, 13 May 2021 20:20:05 +0200
Subject: [PATCH] [re2o] updating variables
---
group_vars/re2o.yml | 5 ++++-
host_vars/re2o.adm.crans.org.yml | 4 ++--
...rans.org => re2o.cachan-adm.crans.org.yml} | 20 +++++++++++++++++--
.../re2o/templates/re2o/settings_local.py.j2 | 2 +-
4 files changed, 25 insertions(+), 6 deletions(-)
rename host_vars/{re2o.cachan-adm.crans.org => re2o.cachan-adm.crans.org.yml} (57%)
diff --git a/group_vars/re2o.yml b/group_vars/re2o.yml
index c3213585..6d2c108c 100644
--- a/group_vars/re2o.yml
+++ b/group_vars/re2o.yml
@@ -7,6 +7,9 @@ glob_re2o:
allowed_hosts:
- 're2o.adm.crans.org'
- 'intranet.adm.crans.org'
+ - 're2o.crans.org'
+ - 'intranet.crans.org'
+ - '172.16.10.156'
from_email: "root@crans.org"
ldap:
master_password: "{{ vault.ldap_master_password }}"
@@ -14,4 +17,4 @@ glob_re2o:
dn: "cn=admin,dc=crans,dc=org"
database:
password: "{{ vault.re2o_db_password }}"
- uri: "tealc.adm.crans.org"
+ uri: "172.16.10.1"
diff --git a/host_vars/re2o.adm.crans.org.yml b/host_vars/re2o.adm.crans.org.yml
index 6460d377..caeb3e41 100644
--- a/host_vars/re2o.adm.crans.org.yml
+++ b/host_vars/re2o.adm.crans.org.yml
@@ -5,8 +5,8 @@ interfaces:
infra: eth2
loc_re2o:
- owner: root
+ owner: www-data
group: _nounou
- version: master_freeradius_python3
+ version: crans
settings_local_owner: www-data
settings_local_group: _nounou
diff --git a/host_vars/re2o.cachan-adm.crans.org b/host_vars/re2o.cachan-adm.crans.org.yml
similarity index 57%
rename from host_vars/re2o.cachan-adm.crans.org
rename to host_vars/re2o.cachan-adm.crans.org.yml
index 9b209353..d4447d89 100644
--- a/host_vars/re2o.cachan-adm.crans.org
+++ b/host_vars/re2o.cachan-adm.crans.org.yml
@@ -12,6 +12,8 @@ glob_ntp_client:
servers:
- terenez.cachan-adm.crans.org
+debian_mirror: http://172.17.10.202/debian
+
loc_re2o:
owner: root
group: _nounou
@@ -19,6 +21,22 @@ loc_re2o:
settings_local_owner: www-data
settings_local_group: _nounou
+ django_secret_key: "{{ vault.re2o_django_secret_key }}"
+ aes_key: "{{ vault.re2o_aes_key }}"
+ admins:
+ - ('Root', 'root@crans.org')
+ allowed_hosts:
+ - 're2o.cachan-adm.crans.org'
+ - 'intranet.cachan-adm.crans.org'
+ from_email: "root@crans.org"
+ ldap:
+ master_password: "{{ vault.ldap_master_password }}"
+ uri: "ldap://re2o-ldap.cachan-adm.crans.org/"
+ dn: "cn=admin,dc=crans,dc=org"
+ database:
+ password: "{{ vault.re2o_db_password }}"
+ uri: "gulp.cachan-adm.crans.org"
+
loc_re2o_front:
server_names:
- "{{ query('ldap', 'ip', 're2o', 'cachan-adm') | ipv4 | first }}"
@@ -27,5 +45,3 @@ loc_re2o_front:
- intranet.cachan-adm.crans.org
- re2o.crans.org
- intranet.crans.org
-
-debian_mirror: http://172.17.10.202/debian
diff --git a/roles/re2o/templates/re2o/settings_local.py.j2 b/roles/re2o/templates/re2o/settings_local.py.j2
index 4c45eed1..1636a370 100644
--- a/roles/re2o/templates/re2o/settings_local.py.j2
+++ b/roles/re2o/templates/re2o/settings_local.py.j2
@@ -93,4 +93,4 @@ GID_RANGES = {
OPTIONNAL_APPS_RE2O = ()
# Some Django apps you want to add in you local project
-OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + ('api',)
+OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + ('api', 'captcha',)
--
GitLab