svg

env/.env

@@ -67,6 +67,7 @@ OPENLDAP_ACTIVATE=1
 OPENLDAP_LOCAL=1
 
 # LDAP
+LDAP_ACTIVATE=${OPENLDAP_ACTIVATE}
 LDAP_TYPE=LDAP
 LDAP_HOST=${OPENLDAP_SERVICE_NAME}
 LDAP_PORT=1389

nine.sh

@@ -22,6 +22,18 @@ stop() {
     docker-compose stop $1
 
     if [[ "$2" != 1 ]]; then echo; fi
+
+    if [[ "$2" != 1 ]]; then Title "REMOVE"; fi
+    
+    if [[ "$1" != "" ]]; then 
+        docker-compose rm -s -v -f "${1}"
+    else
+        for key in $(for k in "${!services[@]}"; do echo "$k:${services[$k]}"; done | sort -t: -k2,2 | cut -d: -f1); do
+            docker-compose rm -s -v -f "${key}"
+        done;    
+    fi
+    
+    if [[ "$2" != 1 ]]; then echo; fi
 }
 
 #===========================================================================================================================================
@@ -269,6 +281,21 @@ then
         template        
         up$2
     fi
+elif [[ $1 == "regenlogs" ]]
+then
+    if [[ -z $2 ]]
+    then
+        destroyall
+        apache
+        template
+        up
+    else
+        destroy$2
+        apache
+        template        
+        up$2
+    fi
+    docker-compose logs -f $2
 else
     EchoRouge "Action possible ="
     EchoRouge "nine.sh > UP de l'ensemble des services actifs"

services/40-keycloak/dockercompose/dockercompose.yml

@@ -5,11 +5,7 @@
   keycloak:
     image: reg.cadoles.com/envole/keycloak:24.0.5
     container_name: nine-keycloak
-    restart: unless-stopped  
+    restart: unless-stopped         
-    healthcheck:
-      test: curl --fail http://127.0.0.1:9990 || exit 1
-      interval: 1s
-      timeout: 60s       
     env_file: ./services/40-keycloak/env/.env.merge
     networks:
       - nine-network
@@ -17,7 +13,12 @@
       - 8999:8999
       - 8443:8443
     volumes:
-      - './services/40-keycloak/volume/nine:/nine'
+      - ./services/40-keycloak/volume/nine:/nine
     command:
       - start-dev
       - --import-realm
+      - --proxy-headers
+      - xforwarded
+      - --http-relative-path
+      - /auth
+

services/40-keycloak/env/.env

@@ -9,15 +9,16 @@ KC_DB_URL=jdbc:mariadb://${MARIADB_HOST}:${MARIADB_PORT}/keycloak
 KC_DB_USERNAME=${MARIADB_USER}
 KC_DB_PASSWORD=${MARIADB_PASSWORD}
 
-KC_HTTPS_CERTIFICATE_FILE=/nine/server.crt.pem
+#KC_HTTPS_CERTIFICATE_FILE=/nine/server.crt.pem
-KC_HTTPS_CERTIFICATE_KEY_FILE=/nine/server.key.pem
+#KC_HTTPS_CERTIFICATE_KEY_FILE=/nine/server.key.pem
 KC_HOSTNAME_PATH=/auth
+#KC_HOSTNAME=nine.local
+#KC_PROXY_ADDRESS_FORWARDING=true
+#KC_PROXY_HEADERS=xforwarded
+
 KC_HTTP_PORT=8999
-KC_HOSTNAME=nine.local
-KC_HOSTNAME_STRICT=false
-KC_PROXY_ADDRESS_FORWARDING=true
-KC_PROXY_HEADERS=xforwarded
 KC_HTTP_ENABLED=true
+KC_HOSTNAME_STRICT=false
 
-KC_IMPORT=/nine/realm-export.json
+#KC_IMPORT=/nine/realm-export.json
 

services/50-nextcloud/volume/prestart/prestart.sh

@@ -84,6 +84,7 @@ fi
 
 echo 
 echo "== USER LDAP"
+
 if [[ "${LDAP_ACTIVATE}" == "1" ]]
 then
     run_as 'php occ app:install user_ldap'