This commit is contained in:
afornerot 2023-11-15 11:48:03 +01:00
parent 021dcbd10c
commit a6f4949e1e
5 changed files with 40 additions and 33 deletions

14
docker/env/.env vendored
View File

@ -72,40 +72,40 @@ CAS_PASSWORD=${ADMIN_PASSWORD}-keycloak
CAS_HOST=keycloak
CAS_PORT=8443
CAS_PATH=/auth/realms/envole/protocol/cas
CAS_URL=${WEB_PROTOCOL}://${CAS_HOST}:${CAS_PORT}
CAS_URL=${PROTOCOLE}://${CAS_HOST}:${CAS_PORT}
# NINEGATE
NINEGATE_SERVICE_NAME=ninegate
NINEGATE_ACTIVATE=1
NINEGATE_LOCAL=1
NINEGATE_URL=${WEB_PROTOCOL}://${WEB_URL}:9000
NINEGATE_URL=${PROTOCOLE}://${WEB_URL}:9000
# NINEGATE
NEXTCLOUD_SERVICE_NAME=nextcloud
NEXTCLOUD_ACTIVATE=0
NEXTCLOUD_LOCAL=1
NEXTCLOUD_URL=${WEB_PROTOCOL}://${WEB_URL}:9001
NEXTCLOUD_URL=${PROTOCOLE}://${WEB_URL}:9001
NEXTCLOUD_SAMBA=0
# ADMINER
ADMINER_SERVICE_NAME=adminer
ADMINER_ACTIVATE=0
ADMINER_LOCAL=1
ADMINER_URL=${WEB_PROTOCOL}://${WEB_URL}:9100/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER}
ADMINER_URL=${PROTOCOLE}://${WEB_URL}:9100/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER}
# PHPLDAPADMIN
PHPLDAPADMIN_SERVICE_NAME=phpldapadmin
PHPLDAPADMIN_ACTIVATE=0
PHPLDAPADMIN_LOCAL=1
PHPLDAPADMIN_URL=${WEB_PROTOCOL}://${WEB_URL}:9101
PHPLDAPADMIN_URL=${PROTOCOLE}://${WEB_URL}:9101
# GENCONFIG
GENCONFIG_ACTIVATE=0
GENCONFIG_URL=${WEB_PROTOCOL}://${WEB_URL}:9102
GENCONFIG_URL=${PROTOCOLE}://${WEB_URL}:9102
# NINEAPACHE
NINEAPACHE_SERVICE_NAME=nineapache
NINEAPACHE_ACTIVATE=0
NINEAPACHE_LOCAL=1
NINEAPACHE_URL=${WEB_PROTOCOL}://${WEB_URL}:9102
NINEAPACHE_URL=${PROTOCOLE}://${WEB_URL}:9102

View File

@ -3,7 +3,7 @@
# Activation Widget
ACTIVATE_WIDADMINER=${ADMINER_ACTIVATE}
WIDADMINER_URL=${ADMINER_URL}
WIDADMINER_URL="${ADMINER_URL}"
ACTIVATE_WIDPHPLDAPADMIN=${PHPLDAPADMIN_ACTIVATE}
WIDPHPLDAPADMIN_URL=${PHPLDAPADMIN_URL}

View File

@ -15,6 +15,8 @@ cat ./env/.env* >> ./.env.local
BigTitle "ENVOLE"
# on remplace les valeur reprise dans les autres .env car podman interprète mal
if [[ "$PODCOMPOSEBIN" == "podman-compose" ]]
then
sed -i 's#${WEB_URL}#'${WEB_URL}'#g' ./.env.local
sed -i 's#${WEB_PROTOCOL}#'${WEB_PROTOCOL}'#g' ./.env.local
. ./.env.local
@ -46,6 +48,7 @@ sed -i 's#${PHPLDAPADMIN_URL}#'${PHPLDAPADMIN_URL}'#g' ./.env.local
sed -i 's#${NEXTCLOUD_ACTIVATE}#'${NEXTCLOUD_ACTIVATE}'#g' ./.env.local
sed -i 's#${NEXTCLOUD_URL}#'${NEXTCLOUD_URL}'#g' ./.env.local
fi
# Include
. ./.env.local
@ -165,6 +168,7 @@ up(){
upservice $LDAP_SERVICE_NAME
$PODCOMPOSEBIN exec $LDAP_SERVICE_NAME /envole/init.sh
echo
fi
# CAS
@ -172,6 +176,7 @@ up(){
then
Title ${CAS_SERVICE_NAME^^}
upservice $CAS_SERVICE_NAME
echo
fi
# NINEGATE
@ -179,6 +184,7 @@ up(){
then
Title ${NINEGATE_SERVICE_NAME^^}
upservice ${NINEGATE_SERVICE_NAME}
chmod -R a+wr ./volume/ninegate/data
echo
fi

View File

@ -4,3 +4,4 @@
ALIAS=ninegate/
FORCE_THEME=%%getBool(%%getVar("ninegate_forcetheme", "non"))
FORCE_THEMENAME=%%getVar("ninegate_forcethemename", "")

View File

@ -67,7 +67,7 @@ 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}
ADMINER_URL="${PROTOCOLE}://${WEB_URL}/adminer/?server=${MARIADB_SERVICE_NAME}&username=${MARIADB_USER}"
# PHPLDAPADMIN
PHPLDAPADMIN_ACTIVATE=%%getBool(%%getVar("activer_phpldapadmin", "non"))