From 4476f452805cbad19502febe8ad455930e829915 Mon Sep 17 00:00:00 2001 From: afornerot Date: Fri, 10 Nov 2023 11:33:16 +0100 Subject: [PATCH] eolisation --- creole/eos-getBool.py | 11 +++++ dicos/90_envole.xml | 15 +++++-- envole.mk | 3 +- eole.mk | 2 +- postservice/99-envole | 6 +++ tmpl/envole.env | 93 ++++++++++++++++++++++++++++--------------- 6 files changed, 93 insertions(+), 37 deletions(-) create mode 100644 creole/eos-getBool.py create mode 100644 postservice/99-envole diff --git a/creole/eos-getBool.py b/creole/eos-getBool.py new file mode 100644 index 0000000..d4ea26b --- /dev/null +++ b/creole/eos-getBool.py @@ -0,0 +1,11 @@ +#!/usr/bin/python + +def getBool(var): + try: + if var == "oui": + return 1 + else: + return 0 + + except: + return "error fonction getBool" diff --git a/dicos/90_envole.xml b/dicos/90_envole.xml index ca07436..1c29707 100644 --- a/dicos/90_envole.xml +++ b/dicos/90_envole.xml @@ -3,7 +3,7 @@ - + envole @@ -210,6 +210,11 @@ openldap_user + + non + ninegate_syncldap + + scribe @@ -217,8 +222,6 @@ ninegate_scribemaster - - non @@ -264,6 +267,12 @@ ninegate_ssoreqitem + + non + + ninegate_openldapreqgroup + + non diff --git a/envole.mk b/envole.mk index 41f2b1f..26ef2b3 100644 --- a/envole.mk +++ b/envole.mk @@ -3,4 +3,5 @@ # # Override plugin destination -docker_REC_DIR = $(DESTDIR)/usr/share/envole/docker +docker_REC_DIR := $(DESTDIR)/usr/share/envole/docker +creole_DATA_DIR := $(DESTDIR)/usr/share/creole/funcs \ No newline at end of file diff --git a/eole.mk b/eole.mk index 9730365..3cd6689 100644 --- a/eole.mk +++ b/eole.mk @@ -157,7 +157,7 @@ install:: install-dirs install-files install-lang # $3 = destination directory define fc_install_file if [ -d $2 ]; then \ - for file in `ls -1 $2/`; do \ + for file in `ls -A1 $2/`; do \ $1 $2/$$file $3 || true; \ done; \ fi diff --git a/postservice/99-envole b/postservice/99-envole new file mode 100644 index 0000000..b52b765 --- /dev/null +++ b/postservice/99-envole @@ -0,0 +1,6 @@ +#!/bin/bash +RunCmd=CreoleRun + +container_path_web=$(CreoleGet container_path_web non) +chmod +x $container_path_web/usr/share/envole/docker/envole.sh +$RunCmd "cd /usr/share/envole/docker && ./envole.sh" web \ No newline at end of file diff --git a/tmpl/envole.env b/tmpl/envole.env index 693186d..091748c 100644 --- a/tmpl/envole.env +++ b/tmpl/envole.env @@ -1,45 +1,74 @@ -#-- LOCAL +#-- LOCAL --------------------------------------------------------------------------------------------------------------------------------- +# GLOBAL RELEASE_SYSTEM=eole -WEB_URL=eolebase.ac-test.fr +WEB_URL=%%getVar('web_url','') WEB_PROTOCOL=https +MASTERIDENTITY=%%getVar('envole_masteridentity','') +MODE_AUTH=%%getVar('envole_modeauth','') -MASTERIDENTITY=LDAP -MODE_AUTH=CAS - -LDAP_ACTIVATE=1 -LDAP_LOCAL=0 -LDAP_HOST=scribe.ac-test.fr -LDAP_PORT=389 -LDAP_USER="cn=reader,o=gouv,c=fr" -LDAP_PASSWORD="uom1eiyighievuli7phahphoh2jieChaebah9owu4aeph0maitiYeiph" -LDAP_BASEDN="o=gouv,c=fr" -LDAP_SYNC=0 -LDAP_BASEUSER="o=gouv,c=fr" -LDAP_BASENIVEAU01="o=gouv,c=fr" -LDAP_BASENIVEAU02="o=gouv,c=fr" -LDAP_BASEGROUP="o=gouv,c=fr" -LDAP_TEMPLATE=scribe -SCRIBE_GROUP=1 -SCRIBE_MASTER=1 +# ANNUAIRE +LDAP_ACTIVATE=%%getBool(%%getVar("activer_openldap", "non")) +LDAP_LOCAL=%%getBool(%%getVar("openldap_local", "non")) +LDAP_HOST=%%getVar("openldap_host", '') +LDAP_PORT=%%getVar("openldap_port", '') +LDAP_TLS=%%getBool(%%getVar("openldap_tls", "non")) +LDAP_BASEDN="%%getVar("openldap_basedn", '')" +LDAP_ADMIN_USERNAME=%%getVar("openldap_user", '') +LDAP_USER="cn=%%getVar("openldap_user", ''),%%getVar("openldap_basedn", '')" +LDAP_PASSWORD="%%getVar("openldap_password", '')" +# SYNCHRONISATION ANNUAIRE<>NINEGATE +LDAP_SYNC=%%getBool(%%getVar("ninegate_syncldap", "non")) +%if %%getVar("ninegate_syncldap", "non") == "non" +LDAP_TEMPLATE=%%getVar("openldap_ldaptemplate", '') +%if %%getVar("openldap_ldaptemplate", '') == "scribe" +SCRIBE_GROUP=%%getBool(%%getVar("ninegate_scribegroup", "non")) +SCRIBE_MASTER=%%getBool(%%getVar("ninegate_scribemaster", "non")) +LDAP_BASEUSER="%%getVar("openldap_basedn","")" +LDAP_BASENIVEAU01="%%getVar("openldap_basedn","")" +LDAP_BASENIVEAU02="%%getVar("openldap_basedn","")" +LDAP_BASEGROUP="%%getVar("openldap_basedn","")" +%end if +%if %%getVar("openldap_ldaptemplate", '') == "open" +OPENLDAPREQNIVEAU01=%%getVar("ninegate_openldapreqniveau01","") +OPENLDAPSYNCHROGROUP=%%getBool(%%getVar("ninegate_openldapsynchrogroup", "non")) +OPENLDAPREQGROUP=%%getVar(%%ninegate_openldapreqgroup,"") +LDAP_BASENIVEAU01="%%ldap_base_dn" +LDAP_BASENIVEAU02="%%ldap_base_dn" +LDAP_BASEUSER="%%getVar(%%ninegate_openldapsubbranchuser,%%getVar(%%ldap_base_dn,""))" +LDAP_BASEGROUP="%%getVar(%%ninegate_openldapsubbranchgroup,%%getVar(%%ldap_base_dn,""))" +%end if +%end if +# CAS +%if %%getVar("MODE_AUTH", '') == "CAS" CAS_ACTIVATE=1 -CAS_LOCAL=0 -CAS_HOST=scribe.ac-test.fr -CAS_PORT=443 -CAS_PATH=/sso -CAS_URL=${WEB_PROTOCOL}://${CAS_HOST}:${CAS_PORT} +%else +CAS_ACTIVATE=0 +%end if +CAS_LOCAL=%%getBool(%%getVar("cas_local", "non")) +CAS_HOST=%%getVar("cas_host", "") +CAS_PORT=%%getVar("cas_port", "") +CAS_PATH=%%getVar("cas_path", "") +CAS_URL=https://%%getVar("cas_host", ""):%%getVar("cas_port", "") -NINEGATE_ACTIVATE=1 +# NINEGATE +NINEGATE_ACTIVATE=%%getBool(%%getVar("activer_ninegate", "non")) NINEGATE_URL=/ninegate -ADMINER_ACTIVATE=1 -ADMINER_URL=/adminer +# NEXTCLOUD +NEXTCLOUD_ACTIVATE=%%getBool(%%getVar("activer_nextcloud", "non")) +NEXTCLOUD_LOCAL=%%getBool(%%getVar("nextcloud_local", "non")) +NEXTCLOUD_URL=%%getVar("nextcloud_url", "/nextcloud") +# ADMINER +ADMINER_ACTIVATE=%%getBool(%%getVar("activer_adminer", "non")) +ADMINER_LOCAL=1 +ADMINER_URL=/adminer/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER} - -NINEAPACHE_ACTIVATE=1 -NINEAPACHE_URL=/nineapache - +# PHPLDAPADMIN +PHPLDAPADMIN_ACTIVATE=%%getBool(%%getVar("activer_phpldapadmin", "non")) +PHPLDAPADMIN_LOCAL=1 +PHPLDAPADMIN_URL=/phpldapadmin