diff --git a/docker/env/.env.zapp.phpldapadmin b/docker/env/.env.zapp.phpldapadmin index aee41a8..7bb8822 100644 --- a/docker/env/.env.zapp.phpldapadmin +++ b/docker/env/.env.zapp.phpldapadmin @@ -1,7 +1,7 @@ # == PHPLDAPADMIN ========================================================================================================================= -PHPLDAPADMIN_LDAP_HOSTS=ldap://${LDAP_SERVICE_NAME}:${LDAP_PORT} +PHPLDAPADMIN_LDAP_HOSTS=ldap://${LDAP_HOST}:${LDAP_PORT} PHPLDAPADMIN_HTTPS="false" PHPLDAPADMIN_SERVER_PATH= diff --git a/docker/envole.sh b/docker/envole.sh index 3338709..18dc0de 100755 --- a/docker/envole.sh +++ b/docker/envole.sh @@ -29,7 +29,7 @@ then sed -i 's#${CAS_USER}#'${CAS_USER}'#g' ./.env.local sed -i 's#${CAS_PASSWORD}#'${CAS_PASSWORD}'#g' ./.env.local - sed -i 's#${LDAP_SERVICE_NAME}#'${LDAP_SERVICE_NAME}'#g' ./.env.local + sed -i 's#${OPENLDAP_SERVICE_NAME}#'${OPENLDAP_SERVICE_NAME}'#g' ./.env.local sed -i 's#${LDAP_ADMIN_USERNAME}#'${LDAP_ADMIN_USERNAME}'#g' ./.env.local sed -i 's#${LDAP_BASEDN}#'${LDAP_BASEDN}'#g' ./.env.local sed -i 's#${LDAP_PASSWORD}#'${LDAP_PASSWORD}'#g' ./.env.local @@ -63,7 +63,7 @@ destroyall(){ if [[ "$?" = 0 ]] then destroy $MARIADB_SERVICE_NAME 1 - destroy $OPENLDAP_SERVICE_NAME 1 + destroy $OPENOPENLDAP_SERVICE_NAME 1 destroy $KEYCLOAK_SERVICE_NAME 1 destroy $NINEGATE_SERVICE_NAME 1 destroy $NINEBOARD_SERVICE_NAME 1 @@ -91,7 +91,7 @@ env() { envall(){ env $MARIADB_SERVICE_NAME - env $OPENLDAP_SERVICE_NAME + env $OPENOPENLDAP_SERVICE_NAME env $KEYCLOAK_SERVICE_NAME env $NINEGATE_SERVICE_NAME env $NINEBOARD_SERVICE_NAME @@ -191,8 +191,8 @@ up(){ # CREATE BDD if [[ $CAS_ACTIVATE == 1 && $CAS_LOCAL == 1 ]] then - EchoVert ${CAS_SERVICE_NAME^^} - $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/init.sh $CAS_SERVICE_NAME + EchoVert ${KEYCLOAK_SERVICE_NAME^^} + $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/init.sh $KEYCLOAK_SERVICE_NAME fi if [[ $NINEGATE_ACTIVATE == 1 && $NINEGATE_LOCAL == 1 ]] @@ -223,21 +223,21 @@ up(){ # OPENLDAP if [[ $LDAP_ACTIVATE == 1 && $LDAP_LOCAL == 1 ]] then - Title ${LDAP_SERVICE_NAME^^} + Title ${OPENLDAP_SERVICE_NAME^^} mkdir -p ./volume/openldap/data chmod a+wr ./volume/openldap/data - upservice $LDAP_SERVICE_NAME - $PODCOMPOSEBIN exec $LDAP_SERVICE_NAME /envole/init.sh + upservice $OPENLDAP_SERVICE_NAME + $PODCOMPOSEBIN exec $OPENLDAP_SERVICE_NAME /envole/init.sh echo fi # CAS if [[ $CAS_ACTIVATE == 1 && $CAS_LOCAL == 1 ]] then - Title ${CAS_SERVICE_NAME^^} - upservice $CAS_SERVICE_NAME + Title ${KEYCLOAK_SERVICE_NAME^^} + upservice $KEYCLOAK_SERVICE_NAME echo fi @@ -314,7 +314,7 @@ destroyall(){ if [[ "$?" = 0 ]] then destroy $MARIADB_SERVICE_NAME 1 - destroy $OPENLDAP_SERVICE_NAME 1 + destroy $OPENOPENLDAP_SERVICE_NAME 1 destroy $KEYCLOAK_SERVICE_NAME 1 destroy $NINEGATE_SERVICE_NAME 1 destroy $NINEBOARD_SERVICE_NAME 1 @@ -351,7 +351,7 @@ destroy(){ fi fi - if [[ "$1" == "$LDAP_SERVICE_NAME" && $LDAP_ACTIVATE == 1 && $LDAP_LOCAL == 1 ]] + if [[ "$1" == "$OPENLDAP_SERVICE_NAME" && $LDAP_ACTIVATE == 1 && $LDAP_LOCAL == 1 ]] then if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer l'annuaire associé à $1 ?";fi if [[ "$?" = 0 || -z $2 ]] @@ -363,12 +363,12 @@ destroy(){ fi fi - if [[ "$1" == "$CAS_SERVICE_NAME" && $CAS_ACTIVATE == 1 && $CAS_LOCAL == 1 ]] + if [[ "$1" == "$KEYCLOAK_SERVICE_NAME" && $CAS_ACTIVATE == 1 && $CAS_LOCAL == 1 ]] then if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi if [[ "$?" = 0 || -z $2 ]] then - $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/delete.sh $CAS_SERVICE_NAME + $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/delete.sh $KEYCLOAK_SERVICE_NAME fi fi