diff --git a/docker/env/.env b/docker/env/.env index 2564498..85d248f 100644 --- a/docker/env/.env +++ b/docker/env/.env @@ -18,7 +18,7 @@ MASTERIDENTITY=SQL # AUTHENTIFICATION # SQL or CAS (todo LDAP or OPENID) -MODE_AUTH=SQL +MODE_AUTH=CAS # MARIADB MARIADB_SERVICE_NAME=mariadb @@ -30,11 +30,11 @@ MARIADB_PASSWORD=${ADMIN_PASSWORD} # LDAP # LDAP_SYNC Si MASTERIDENTITY = SQL permet la synchronisation des utilisateurs SQL vers LDAP -LDAP_SERVICE_NAME=openldap +OPENLDAP_SERVICE_NAME=openldap LDAP_ACTIVATE=1 LDAP_LOCAL=1 LDAP_TYPE=LDAP -LDAP_HOST=${LDAP_SERVICE_NAME} +LDAP_HOST=${OPENLDAP_SERVICE_NAME} LDAP_PORT=1389 LDAP_TLS=0 LDAP_BASEDN=dc=envole,dc=org @@ -64,13 +64,13 @@ OPENLDAPREQGROUP= # CAS # attention si localhost = ajouter keycloak dans votre propre host : le service web doit valider son ticket via le nom du service et votre navigateur doit assi le voir -CAS_SERVICE_NAME=keycloak +KEYCLOAK_SERVICE_NAME=keycloak CAS_ACTIVATE=1 CAS_LOCAL=1 CAS_USER=${ADMIN_USER}-keycloak CAS_PASSWORD=${ADMIN_PASSWORD}-keycloak CAS_HOST=keycloak -CAS_PORT=8443 +CAS_PORT=8080 CAS_PATH=/auth/realms/envole/protocol/cas CAS_URL=${PROTOCOLE}://${CAS_HOST}:${CAS_PORT} @@ -94,7 +94,7 @@ NINEBOARD_LOCAL=1 NINEBOARD_URL=${PROTOCOLE}://${WEB_URL}:9002 # WORDPRESS -WORDPRESS_SERVICE_NAME=nineboard +WORDPRESS_SERVICE_NAME=wordpress WORDPRESS_ACTIVATE=1 WORDPRESS_LOCAL=1 WORDPRESS_URL=${PROTOCOLE}://${WEB_URL}:9003 diff --git a/docker/env/.env.zapp.wordpress b/docker/env/.env.zapp.wordpress index 1077a7e..e099002 100644 --- a/docker/env/.env.zapp.wordpress +++ b/docker/env/.env.zapp.wordpress @@ -1,5 +1,5 @@ -# == NEXTCLOUD ============================================================================================================================ +# == WORDPRESS ============================================================================================================================ WORDPRESS_DB_HOST=mariadb WORDPRESS_DB_NAME=wordpress diff --git a/docker/envole.sh b/docker/envole.sh index 18dc0de..a13fdca 100755 --- a/docker/envole.sh +++ b/docker/envole.sh @@ -63,7 +63,7 @@ destroyall(){ if [[ "$?" = 0 ]] then destroy $MARIADB_SERVICE_NAME 1 - destroy $OPENOPENLDAP_SERVICE_NAME 1 + destroy $OPENLDAP_SERVICE_NAME 1 destroy $KEYCLOAK_SERVICE_NAME 1 destroy $NINEGATE_SERVICE_NAME 1 destroy $NINEBOARD_SERVICE_NAME 1 @@ -79,6 +79,7 @@ env() { rm -rf ./tmp/.env.$1 mkdir -p ./tmp +Echo $1 cat ./env/.env >> ./tmp/.env.$1 if [[ -f ./env/.env.local ]]; then cat ./env/.env.local >> ./tmp/.env.$1; fi if [[ -f ./env/.env.zapp.$1 ]]; then cat ./env/.env.zapp.$1 >> ./tmp/.env.$1; fi @@ -91,7 +92,7 @@ env() { envall(){ env $MARIADB_SERVICE_NAME - env $OPENOPENLDAP_SERVICE_NAME + env $OPENLDAP_SERVICE_NAME env $KEYCLOAK_SERVICE_NAME env $NINEGATE_SERVICE_NAME env $NINEBOARD_SERVICE_NAME @@ -300,7 +301,7 @@ up(){ fi else Title ${1^^} - env ${NINEAPACHE_SERVICE_NAME} + env ${1} $PODCOMPOSEBIN up -d $1 fi } @@ -314,7 +315,7 @@ destroyall(){ if [[ "$?" = 0 ]] then destroy $MARIADB_SERVICE_NAME 1 - destroy $OPENOPENLDAP_SERVICE_NAME 1 + destroy $OPENLDAP_SERVICE_NAME 1 destroy $KEYCLOAK_SERVICE_NAME 1 destroy $NINEGATE_SERVICE_NAME 1 destroy $NINEBOARD_SERVICE_NAME 1