eolisation

This commit is contained in:
afornerot 2023-11-10 11:33:16 +01:00
parent 460bdb3993
commit 4476f45280
6 changed files with 93 additions and 37 deletions

11
creole/eos-getBool.py Normal file
View File

@ -0,0 +1,11 @@
#!/usr/bin/python
def getBool(var):
try:
if var == "oui":
return 1
else:
return 0
except:
return "error fonction getBool"

View File

@ -3,7 +3,7 @@
<containers> <containers>
<container name='web'> <container name='web'>
<file filelist='envole' name='/etc/apache2/sites-available/envole' source='envole-apache.conf' rm="True"/> <file filelist='envole' name='/etc/apache2/sites-available/envole' source='envole-apache.conf' rm="True"/>
<file filelist='envole' name='/usr/share/envole/docker/.env.local' source='ninegate-env.local' rm='True'/> <file filelist='envole' name='/usr/share/envole/docker/env/.env.local' source='envole.env' rm='True'/>
<service method='apache' servicelist='envole'>envole</service> <service method='apache' servicelist='envole'>envole</service>
</container> </container>
@ -210,6 +210,11 @@
<target type='variable'>openldap_user</target> <target type='variable'>openldap_user</target>
</condition> </condition>
<condition name='hidden_if_in' source='openldap_local'>
<param>non</param>
<target type='variable'>ninegate_syncldap</target>
</condition>
<condition name='hidden_if_not_in' source='openldap_ldaptemplate'> <condition name='hidden_if_not_in' source='openldap_ldaptemplate'>
<param>scribe</param> <param>scribe</param>
@ -217,8 +222,6 @@
<target type='variable'>ninegate_scribemaster</target> <target type='variable'>ninegate_scribemaster</target>
</condition> </condition>
<!-- NINEGATE --> <!-- NINEGATE -->
<condition name='hidden_if_in' source='activer_ninegate'> <condition name='hidden_if_in' source='activer_ninegate'>
<param>non</param> <param>non</param>
@ -264,6 +267,12 @@
<target type='variable'>ninegate_ssoreqitem</target> <target type='variable'>ninegate_ssoreqitem</target>
</condition> </condition>
<condition name='hidden_if_in' source='ninegate_openldapsynchrogroup'>
<param>non</param>
<target type='variable'>ninegate_openldapreqgroup</target>
</condition>
<condition name='hidden_if_in' source='ninegate_forcetheme'> <condition name='hidden_if_in' source='ninegate_forcetheme'>
<param>non</param> <param>non</param>

View File

@ -3,4 +3,5 @@
# #
# Override plugin destination # 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

View File

@ -157,7 +157,7 @@ install:: install-dirs install-files install-lang
# $3 = destination directory # $3 = destination directory
define fc_install_file define fc_install_file
if [ -d $2 ]; then \ if [ -d $2 ]; then \
for file in `ls -1 $2/`; do \ for file in `ls -A1 $2/`; do \
$1 $2/$$file $3 || true; \ $1 $2/$$file $3 || true; \
done; \ done; \
fi fi

6
postservice/99-envole Normal file
View File

@ -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

View File

@ -1,45 +1,74 @@
#-- LOCAL #-- LOCAL ---------------------------------------------------------------------------------------------------------------------------------
# GLOBAL
RELEASE_SYSTEM=eole RELEASE_SYSTEM=eole
WEB_URL=eolebase.ac-test.fr WEB_URL=%%getVar('web_url','')
WEB_PROTOCOL=https WEB_PROTOCOL=https
MASTERIDENTITY=%%getVar('envole_masteridentity','')
MODE_AUTH=%%getVar('envole_modeauth','')
MASTERIDENTITY=LDAP # ANNUAIRE
MODE_AUTH=CAS LDAP_ACTIVATE=%%getBool(%%getVar("activer_openldap", "non"))
LDAP_LOCAL=%%getBool(%%getVar("openldap_local", "non"))
LDAP_ACTIVATE=1 LDAP_HOST=%%getVar("openldap_host", '')
LDAP_LOCAL=0 LDAP_PORT=%%getVar("openldap_port", '')
LDAP_HOST=scribe.ac-test.fr LDAP_TLS=%%getBool(%%getVar("openldap_tls", "non"))
LDAP_PORT=389 LDAP_BASEDN="%%getVar("openldap_basedn", '')"
LDAP_USER="cn=reader,o=gouv,c=fr" LDAP_ADMIN_USERNAME=%%getVar("openldap_user", '')
LDAP_PASSWORD="uom1eiyighievuli7phahphoh2jieChaebah9owu4aeph0maitiYeiph" LDAP_USER="cn=%%getVar("openldap_user", ''),%%getVar("openldap_basedn", '')"
LDAP_BASEDN="o=gouv,c=fr" LDAP_PASSWORD="%%getVar("openldap_password", '')"
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
# 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_ACTIVATE=1
CAS_LOCAL=0 %else
CAS_HOST=scribe.ac-test.fr CAS_ACTIVATE=0
CAS_PORT=443 %end if
CAS_PATH=/sso CAS_LOCAL=%%getBool(%%getVar("cas_local", "non"))
CAS_URL=${WEB_PROTOCOL}://${CAS_HOST}:${CAS_PORT} 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 NINEGATE_URL=/ninegate
ADMINER_ACTIVATE=1 # NEXTCLOUD
ADMINER_URL=/adminer 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}
# PHPLDAPADMIN
NINEAPACHE_ACTIVATE=1 PHPLDAPADMIN_ACTIVATE=%%getBool(%%getVar("activer_phpldapadmin", "non"))
NINEAPACHE_URL=/nineapache PHPLDAPADMIN_LOCAL=1
PHPLDAPADMIN_URL=/phpldapadmin