From 55c46352f92f154a223467a0b6813c059d565ac3 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Tue, 22 Jun 2021 15:26:05 +0200
Subject: [PATCH] [re2o] Select optional apps
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/re2o.yml | 4 ++++
host_vars/routeur-gulp.cachan-adm.crans.org/radius.yml | 2 ++
roles/re2o/templates/re2o/settings_local.py.j2 | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/group_vars/re2o.yml b/group_vars/re2o.yml
index dc9950ee..09c1e764 100644
--- a/group_vars/re2o.yml
+++ b/group_vars/re2o.yml
@@ -19,3 +19,7 @@ glob_re2o:
database:
password: "{{ vault.re2o_db_password }}"
uri: "172.16.10.1"
+ optional_apps:
+ - api
+ - captcha
+ - prefix_delegation
diff --git a/host_vars/routeur-gulp.cachan-adm.crans.org/radius.yml b/host_vars/routeur-gulp.cachan-adm.crans.org/radius.yml
index 0dc1b1b3..2d3bdb39 100644
--- a/host_vars/routeur-gulp.cachan-adm.crans.org/radius.yml
+++ b/host_vars/routeur-gulp.cachan-adm.crans.org/radius.yml
@@ -21,3 +21,5 @@ loc_re2o:
database:
password: "{{ vault.re2o_db_password }}"
uri: "{{ query('ldap', 'ip', 'gulp', 'cachan-adm') | ipv4 | first }}"
+
+ optional_apps: []
diff --git a/roles/re2o/templates/re2o/settings_local.py.j2 b/roles/re2o/templates/re2o/settings_local.py.j2
index c8703387..cdf56085 100644
--- a/roles/re2o/templates/re2o/settings_local.py.j2
+++ b/roles/re2o/templates/re2o/settings_local.py.j2
@@ -93,6 +93,6 @@ GID_RANGES = {
OPTIONNAL_APPS_RE2O = ()
# Some Django apps you want to add in you local project
-OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + ('api', 'captcha', 'prefix_delegation',)
+OPTIONNAL_APPS = OPTIONNAL_APPS_RE2O + ({% for app in re2o.optional_apps %}'{{ app }}', {% endfor %})
PREFIX_DELEGATION_OWNER = 'users.User'
--
GitLab