svg

.gitignore

@@ -1,45 +1,57 @@
-.env.local
-/env/*.local
-/tmp
+**/.env.local
+**/.env.merge
 
-/volume/mariadb/mysql
+/services/10-nineapache/volume/apache
 
-/volume/minio/data
+/services/15-mariadb/volume/mysql
 
-/volume/nextcloud/data
-/volume/nextcloud/html
-/volume/nextcloud/app
+/services/30-minio/volume/data
 
-/volume/ninegate/data/private/*
-!/volume/ninegate/data/private/.gitkeep
-/volume/ninegate/data/public/*
-!/volume/ninegate/data/public/avatar
-/volume/ninegate/data/public/avatar/*
-!/volume/ninegate/data/public/avatar/admin.jpg
-!/volume/ninegate/data/public/avatar/noavatar.png
-!/volume/ninegate/data/public/avatar/system.jpg
-!/volume/ninegate/data/public/logo
-/volume/ninegate/data/public/logo/*
-!/volume/ninegate/data/public/logo/logo.png
-!/volume/ninegate/data/public/header
-/volume/ninegate/data/public/header/*
-!/volume/ninegate/data/public/header/header.png
-!/volume/ninegate/data/public/icon
-/volume/ninegate/data/public/icon/*
-!/volume/ninegate/data/public/icon/icon_*.png
+/services/30-openldap/volume/data
+
+/services/50-nextcloud/volume/data
+/services/50-nextcloud/volume/html
+/services/50-nextcloud/volume/app
+
+/services/50-nineboard/volume/data/private/*
+!/services/50-nineboard/volume/data/private/.gitkeep
+/services/50-nineboard/volume/data/public/*
+!/services/50-nineboard/volume/data/public/avatar
+/services/50-nineboard/volume/data/public/avatar/*
+!/services/50-nineboard/volume/data/public/avatar/admin.jpg
+!/services/50-nineboard/volume/data/public/avatar/noavatar.png
+!/services/50-nineboard/volume/data/public/avatar/system.jpg
+!/services/50-nineboard/volume/data/public/logo
+/services/50-nineboard/volume/data/public/logo/*
+!/services/50-nineboard/volume/data/public/logo/logo.png
+
+
+/services/50-ninegate/volume/data/private/*
+!/services/50-ninegate/volume/data/private/.gitkeep
+/services/50-ninegate/volume/data/public/*
+!/services/50-ninegate/volume/data/public/avatar
+/services/50-ninegate/volume/data/public/avatar/*
+!/services/50-ninegate/volume/data/public/avatar/admin.jpg
+!/services/50-ninegate/volume/data/public/avatar/noavatar.png
+!/services/50-ninegate/volume/data/public/avatar/system.jpg
+!/services/50-ninegate/volume/data/public/logo
+/services/50-ninegate/volume/data/public/logo/*
+!/services/50-ninegate/volume/data/public/logo/logo.png
+!/services/50-ninegate/volume/data/public/header
+/services/50-ninegate/volume/data/public/header/*
+!/services/50-ninegate/volume/data/public/header/header.png
+!/services/50-ninegate/volume/data/public/icon
+/services/50-ninegate/volume/data/public/icon/*
+!/services/50-ninegate/volume/data/public/icon/icon_*.png
+
+
+/services/50-nineskeletor/volume/data/private/*
+!/services/50-nineskeletor/volume/data/private/.gitkeep
+/services/50-nineskeletor/volume/data/public/*
+!/services/50-nineskeletor/volume/data/public/.gitkeep
+/services/50-nineskeletor/volume/apache
+
+/services/50-wordpress/volume/data
 
-/volume/nineboard/data/private/*
-!/volume/nineboard/data/private/.gitkeep
-/volume/nineboard/data/public/*
-!/volume/nineboard/data/public/avatar
-/volume/nineboard/data/public/avatar/*
-!/volume/nineboard/data/public/avatar/admin.jpg
-!/volume/nineboard/data/public/avatar/noavatar.png
-!/volume/nineboard/data/public/avatar/system.jpg
-!/volume/nineboard/data/public/logo
-/volume/nineboard/data/public/logo/*
-!/volume/nineboard/data/public/logo/logo.png
 
-/volume/openldap/data
 
-/volume/wordpress/data

docker-compose.yml

@@ -1,232 +0,0 @@
-version: '3'
-
-services:
-
-#== SERVICES OUTILS =======================================================================================================================
-
-  # Nineapache
-  # Reverse proxy de l'ensemble des services
-  # Seul port ouvert sur l'exterieur
-  nineapache:
-    image: reg.cadoles.com/envole/nineapache:8.1
-    container_name: nine-nineapache
-    restart: unless-stopped
-    healthcheck:
-      test: curl --fail http://localhost || exit 1
-      interval: 1s
-      timeout: 60s      
-    env_file: ./tmp/.env.nineapache
-    networks:
-      - nine-network
-    ports:
-      - "80:80"  
-    volumes:
-      - ./volume/nineapache/nine/apache.conf:/etc/apache2/conf.d/zapp.conf
-
-  # Mariadb
-  # Base de données des services
-  # Port interne 3306
-  mariadb:
-    image: docker.io/library/mariadb
-    container_name: nine-mariadb
-    restart: unless-stopped
-    healthcheck:
-      test: /nine/check.sh    
-      interval: 1s
-      timeout: 60s      
-    env_file: ./tmp/.env.mariadb
-    networks:
-      - nine-network
-    volumes:
-      - ./volume/mariadb/mysql:/var/lib/mysql
-      - ./volume/mariadb/nine:/nine
-
-  # Redis
-  # Base de données redis pour les services qui souhaitent stocker leur session en bdd
-  # Port interne 6379
-  redis:
-    image: redis:4.0
-    container_name: nine-redis
-    environment:
-      - TZ=Europe/Paris
-
-  # Minio
-  # Stocakge S3
-  # Port interne 9000 pour le stockage / Port interne 9001 pour l'interface web
-  minio:
-    image: minio/minio
-    container_name: nine-minio
-    restart: unless-stopped      
-    env_file: ./tmp/.env.minio
-    networks:
-      - nine-network
-    volumes:
-      - './volume/minio/data:/data'
-    command: server /data --console-address ":9001"
-
-  # Openldap
-  # Annuaire
-  # Port interne 1389 & 1636
-  openldap:
-    image: docker.io/bitnami/openldap:2
-    container_name: nine-openldap
-    restart: unless-stopped
-    healthcheck:
-      test: /nine/check.sh    
-      interval: 1s
-      timeout: 60s     
-    env_file: ./tmp/.env.openldap
-    networks:
-      - nine-network
-    volumes:
-      - './volume/openldap/data:/bitnami/openldap'
-      - './volume/openldap/nine:/nine'
-
-  # Keycloak
-  # serveur SSO
-  # Port interne 8999 & 8443
-  keycloak:
-    image: reg.cadoles.com/envole/keycloak:24.0.5
-    container_name: nine-keycloak
-    restart: unless-stopped  
-    healthcheck:
-      test: curl --fail http://127.0.0.1:9990 || exit 1
-      interval: 1s
-      timeout: 60s       
-    env_file: ./tmp/.env.keycloak
-    networks:
-      - nine-network
-    ports:
-      - 8999:8999
-      - 8443:8443
-    volumes:
-      - './volume/keycloak/nine:/nine'
-    command:
-      - start-dev
-      - --import-realm
-
-#== SERVICES APPLICATIF =======================================================================================================================
-
-  # Nextcloud
-  # Hébergement de fichiers et une plateforme de collaboration
-  # Port interne 80
-  nextcloud:
-    image: reg.cadoles.com/envole/nextcloud
-    container_name: nine-nextcloud
-    restart: unless-stopped
-    healthcheck:
-      test: curl --fail http://localhost || exit 1    
-      interval: 1s
-      timeout: 60s      
-    env_file: ./tmp/.env.nextcloud
-    networks:
-      - nine-network
-    volumes:
-      - ./volume/nextcloud/html:/var/www/html
-      - ./volume/nextcloud/app:/var/www/html/custom_apps
-      - ./volume/nextcloud/data:/var/www/html/data
-      - ./volume/nextcloud/nine:/nine
-      - ./volume/nextcloud/prestart:/docker-entrypoint-hooks.d/before-starting
-
-  # Nineboard
-  # Tableaux de bord collaboratif
-  # Port interne 80
-  nineboard:
-    image: reg.cadoles.com/envole/nineboard
-    container_name: nine-nineboard
-    restart: unless-stopped
-    healthcheck:
-      test: curl --fail http://localhost/nineboard || exit 1
-      interval: 1s
-      timeout: 60s      
-    env_file: ./tmp/.env.nineboard
-    networks:
-      - nine-network
-    volumes:
-      - ./volume/nineboard/data/private:/app/uploads
-      - ./volume/nineboard/data/public:/app/public/uploads
-
-  # Ninegate
-  # Portail collaboratif
-  # Port interne 80
-  ninegate:
-    image: reg.cadoles.com/envole/ninegate
-    container_name: nine-ninegate
-    restart: unless-stopped
-    healthcheck:
-      test: curl --fail http://localhost/ninegate || exit 1
-      interval: 1s
-      timeout: 60s      
-    env_file: ./tmp/.env.ninegate
-    networks:
-      - nine-network
-    volumes:
-      - ./volume/ninegate/data/private:/app/uploads
-      - ./volume/ninegate/data/public:/app/public/uploads
-
-  # Wiki.js
-  # Wiki
-  # Port interne 3000
-  wiki:
-    image: linuxserver/dokuwiki
-    container_name: nine-wiki
-    env_file: ./tmp/.env.wiki
-    networks:
-      - nine-network
-    ports:
-      - 9000:80
-
-  # Wordpress
-  # Reseau de blog
-  # Port interne 80
-  wordpress:
-    image: reg.cadoles.com/envole/wordpress
-    container_name: nine-wordpress
-    restart: unless-stopped
-    healthcheck:
-      test: curl --fail http://localhost/wordpress || exit 1
-      interval: 1s
-      timeout: 60s      
-    env_file: ./tmp/.env.wordpress
-    networks:
-      nine-network:
-        aliases:
-          - blog
-    volumes:
-      - ./volume/wordpress/data:/app/public/wp-content    
-
-#== SERVIVES DEVELOPPEUR ==================================================================================================================
-
-  # Adminer
-  # Gestionnaire BDD
-  # Port interne 8080
-  adminer:
-    image: docker.io/library/adminer
-    container_name: nine-adminer
-    restart: unless-stopped
-    env_file: ./tmp/.env.adminer
-    networks:
-      - nine-network
-    ports:
-      - 9100:8080       
-
-  # Phpldapadmin
-  # Gestionnaire Annuaire
-  # Port interne 80
-  phpldapadmin:
-    image: docker.io/osixia/phpldapadmin:latest
-    container_name: nine-phpldapadmin
-    restart: unless-stopped      
-    env_file: ./tmp/.env.phpldapadmin
-    networks:
-      - nine-network
-    ports:
-      - "9101:80"    
-
-#== NETWORKS ==============================================================================================================================
-
-networks:
-  nine-network:
-    name: nine-network
-
-    

env/.env

@@ -48,21 +48,25 @@ MARIADB_PASSWORD=${ADMIN_PASSWORD}
 REDIS_SERVICE_NAME=redis
 REDIS_ACTIVATE=1
 REDIS_LOCAL=1
+REDIS_HOST=${REDIS_SERVICE_NAME}
+REDIS_PORT=6379
 
 # MINIO
 MINIO_SERVICE_NAME=minio
 MINIO_ACTIVATE=1
 MINIO_LOCAL=1
 MINIO_HOST=${MINIO_SERVICE_NAME}
-MINIO_PORT=7200
-MINIO_URL=${PROTOCOLE}://${WEB_URL}/minio
+MINIO_PORT=9000
+MINIO_URL=${PROTOCOLE}://${WEB_URL}:9001
 
 
-# LDAP
+# OPENLDAP
 # LDAP_SYNC Si MASTERIDENTITY = SQL permet la synchronisation des utilisateurs SQL vers LDAP
 OPENLDAP_SERVICE_NAME=openldap
-LDAP_ACTIVATE=1
-LDAP_LOCAL=1
+OPENLDAP_ACTIVATE=1
+OPENLDAP_LOCAL=1
+
+# LDAP
 LDAP_TYPE=LDAP
 LDAP_HOST=${OPENLDAP_SERVICE_NAME}
 LDAP_PORT=1389
@@ -71,10 +75,11 @@ LDAP_BASEDN=dc=nine,dc=org
 LDAP_ADMIN_USERNAME=${ADMIN_USER}
 LDAP_USER=cn=${LDAP_ADMIN_USERNAME},${LDAP_BASEDN}
 LDAP_PASSWORD=${ADMIN_PASSWORD}
-LDAP_BASEUSER=ou=users,ou=ninegate,${LDAP_BASEDN}
-LDAP_BASENIVEAU01=ou=niveau01,ou=ninegate,${LDAP_BASEDN}
-LDAP_BASENIVEAU02=ou=niveau02,ou=ninegate,${LDAP_BASEDN}
-LDAP_BASEGROUP=ou=groups,ou=ninegate,${LDAP_BASEDN}
+LDAP_BASEORGANISATION=ou=ninegate,${LDAP_BASEDN}
+LDAP_BASEUSER=ou=users,${LDAP_BASEORGANISATION}
+LDAP_BASENIVEAU01=ou=niveau01,${LDAP_BASEORGANISATION}
+LDAP_BASENIVEAU02=ou=niveau02,${LDAP_BASEORGANISATION}
+LDAP_BASEGROUP=ou=groups,${LDAP_BASEORGANISATION}
 LDAP_SYNC=1 
 LDAP_TEMPLATE=open
 LDAP_USERNAME=uid
@@ -92,10 +97,13 @@ OPENLDAPREQNIVEAU01="(&(uid=*)(objectclass=inetOrgPerson)(!(description=Computer
 OPENLDAPSYNCHROGROUP=0
 OPENLDAPREQGROUP=
 
-# CAS
+# KEYCLOAK
 KEYCLOAK_SERVICE_NAME=keycloak
-CAS_ACTIVATE=1
-CAS_LOCAL=1
+KEYCLOAK_ACTIVATE=1
+KEYCLOAK_LOCAL=1
+
+# CAS
+CAS_ACTIVATE=${KEYCLOAK_ACTIVATE}
 CAS_USER=${ADMIN_USER}-keycloak
 CAS_PASSWORD=${ADMIN_PASSWORD}-keycloak
 CAS_HOST=${WEB_URL}
@@ -103,11 +111,12 @@ CAS_PORT=8999
 CAS_PATH=/auth/realms/nine/protocol/cas
 CAS_URL=${PROTOCOLE}://${CAS_HOST}:${CAS_PORT}
 
-# NINEBOARD
-NINEBOARD_SERVICE_NAME=nineboard
-NINEBOARD_ACTIVATE=1
-NINEBOARD_LOCAL=1
-NINEBOARD_URL=${PROTOCOLE}://${WEB_URL}/nineboard
+
+# DOKUWIKI
+DOKUWIKI_SERVICE_NAME=dokuwiki
+DOKUWIKI_ACTIVATE=0
+DOKUWIKI_LOCAL=1
+DOKUWIKI_URL=${PROTOCOLE}://${WEB_URL}/dokuwiki
 
 # NEXTCLOUD
 NEXTCLOUD_SERVICE_NAME=nextcloud
@@ -116,17 +125,23 @@ NEXTCLOUD_LOCAL=1
 NEXTCLOUD_URL=${PROTOCOLE}://${WEB_URL}/nextcloud
 NEXTCLOUD_SAMBA=0
 
+# NINEBOARD
+NINEBOARD_SERVICE_NAME=nineboard
+NINEBOARD_ACTIVATE=1
+NINEBOARD_LOCAL=1
+NINEBOARD_URL=${PROTOCOLE}://${WEB_URL}/nineboard
+
 # NINEGATE
 NINEGATE_SERVICE_NAME=ninegate
 NINEGATE_ACTIVATE=1
 NINEGATE_LOCAL=1
 NINEGATE_URL=${PROTOCOLE}://${WEB_URL}/ninegate
 
-# WIKI
-WIKI_SERVICE_NAME=wiki
-WIKI_ACTIVATE=1
-WIKI_LOCAL=1
-WIKI_URL=${PROTOCOLE}://${WEB_URL}/wiki
+# NINESKELETOR
+NINESKELETOR_SERVICE_NAME=nineskeletor
+NINESKELETOR_ACTIVATE=1
+NINESKELETOR_LOCAL=1
+NINESKELETOR_URL=${PROTOCOLE}://${WEB_URL}/nineskeletor
 
 # WORDPRESS
 WORDPRESS_SERVICE_NAME=wordpress

misc/e-ihm.sh

@@ -1,186 +0,0 @@
-#!/bin/bash
-
-TPUT=/usr/bin/tput
-#test si TPUT est utilisable
-if [ ! "$TERM" = "" ] && $TPUT hpa 60 >/dev/null 2>&1 && $TPUT setaf 1  >/dev/null 2>&1; then
-    FANCYTTY=1
-else
-    FANCYTTY=0
-fi
-
-Pause() {
-if [ "$ModeTxt" == "yes" ];then
-    echo
-elif [ "$ModeEad" == "yes" ];then
-    echo "<br>"
-else
-    [ $FANCYTTY = 1 ] && $TPUT setaf 6
-    echo " Appuyez sur Entrée pour continuer ..."
-    [ $FANCYTTY = 1 ] && $TPUT sgr0
-    read BiDon
-fi
-}
-
-Echo() {
-if [ "$ModeEad" != "yes" ];
-then
-    echo "$1"
-else
-    echo "$1<br>"
-fi
-}
-
-EchoColor() {
-if [ "$ModeTxt" = "yes" ];then
-    echo "$1"
-elif [ "$ModeEad" = "yes" ];then
-    echo "<FONT color=\"$3\"> $1 </FONT><br>"
-else
-    [ "$FANCYTTY" = 1 ] && $TPUT setaf $2
-    echo "$1"
-    [ "$FANCYTTY" = 1 ] && $TPUT sgr0
-fi
-}
-
-EchoRouge() {
-    EchoColor "$1" "1" "red"
-}
-
-EchoVert() {
-    EchoColor "$1" "2" "green"
-}
-
-EchoOrange() {
-    EchoColor "$1" "3" "orange"
-}
-
-EchoBleu() {
-    EchoColor "$1" "4" "blue"
-}
-
-EchoMagenta() {
-    EchoColor "$1" "5" "magenta"
-}
-
-EchoCyan() {
-    EchoColor "$1" "6" "cyan"
-}
-
-EchoBlanc() {
-    EchoColor "$1" "7" "white"
-}
-
-EchoGras() {
-if [ "$ModeTxt" == "yes" ];then
-    echo "$1"
-elif [ "$ModeEad" == "yes" ];then
-    echo "<b> $1 </b><br>"
-else
-    [ $FANCYTTY = 1 ] && $TPUT bold
-    echo "$1"
-    [ $FANCYTTY = 1 ] && $TPUT sgr0
-fi
-}
-
-Clear() {
-if [ "$ModeEad" != "yes" -a "$ModeTxt" != "yes" ];then
-    clear
-fi
-}
-
-Question_ouinon() {
-    #attention, il faut synchroniser les modifications avec /usr/share/pyshared/pyeole/ihm.py
-    question=$1
-    [ "$2" = "" ] && interactive='True' || interactive=$2
-    [ "$3" = "" ] && default="non" || default=$3
-    [ "$4" = "" ] && level="info" || level=$4
-    [ "$5" = "" ] && default_uninteractive=$default || default_uninteractive=$5
-    [ ! "$interactive" = "True" ] && [ ! "$interactive" = "False" ] && echo "Question_ouinon : interactive doit être True ou False" && exit 1
-    [ ! "$default" = "oui" ] && [ ! "$default" = "non" ] && echo "Question_ouinon : default doit etre oui ou non" && exit 1
-    [ ! "$default_uninteractive" = "oui" ] && [ ! "$default_uninteractive" = "non" ] && echo "Question_ouinon : default_uninteractive doit etre oui ou non" && exit 1
-    [ ! "$level" = "info" ] && [ ! "$level" = "warn" ] && [ ! "$level" = "err" ] && echo "Question_ouinon : level doit etre info, warn ou err" && exit 1
-    #non interactive
-    if [ "$interactive" = "False" ]; then
-        Rep=default_uninteractive
-    else
-        question="$question [oui/non]"
-        if [ $level = "info" ]; then
-            echo "$question"
-        elif [ $level = "warn" ]; then
-            EchoOrange "$question"
-        else
-            EchoRouge "$question"
-        fi
-        echo -n "[$default] : "
-        read Rep
-        #passe en minuscule
-        Rep=`echo $Rep | tr A-Z a-z`
-    fi
-    if [ "$default" = "non" ]; then
-        if [ "$Rep" = "oui" -o "$Rep" = "o" -o "$Rep" = "yes" -o "$Rep" = "y" ];then
-            return 0
-        else
-            return 1
-        fi
-    else
-        if [ "$Rep" = "non" -o "$Rep" = "n" -o "$Rep" = "no" ];then
-            return 1
-        else
-            return 0
-        fi
-    fi
-}
-
-EchoStart() {
-    for i in $(eval echo "{1..30}")
-    do    
-        ligne+="="
-    done
-    clear
-}
-
-BigTitle(){
-    size=`tput cols`
-    nb=${#1}
-    nbchar=$(($size - $nb - 4)) 
-
-    ligne=""
-    for i in $(eval echo "{1..$size}")
-    do    
-        ligne+="="
-    done
-
-    finligne=""
-    for i in $(eval echo "{1..$nbchar}")
-    do    
-        finligne+="="
-    done
-    
-    echo
-    EchoVert $ligne
-    EchoVert "== $1 $finligne" 
-    EchoVert $ligne
-    echo
-}
-
-Title(){
-    size=`tput cols`
-    nb=${#1}
-    nbchar=$(($size - $nb - 4)) 
-
-    ligne=""
-    for i in $(eval echo "{1..$size}")
-    do    
-        ligne+="="
-    done
-
-    finligne=""
-    for i in $(eval echo "{1..$nbchar}")
-    do    
-        finligne+="="
-    done
-    
-    echo
-    EchoCyan "== $1 $finligne" 
-    echo
-}

misc/images/nineapache8/containers/nineapache/Dockerfile

@@ -61,7 +61,8 @@ RUN npm install -g yarn
 COPY apache2.sh /etc/apache2/apache2.sh
 RUN chmod +x /etc/apache2/apache2.sh  
 COPY php.local.ini /etc/php81/conf.d/
-COPY apache.conf /etc/apache2/conf.d/zapp.conf
+COPY httpd.conf /etc/apache2/httpd.conf
+COPY site.conf /etc/apache2/conf.d/nine/site.conf
 COPY ssl.conf /etc/apache2/conf.d/ssl.conf
 COPY index.php /app/public/index.php
 

misc/images/nineapache8/containers/nineapache/httpd.conf

@@ -0,0 +1,483 @@
+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" 
+# will be interpreted as '/logs/access_log'.
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+ServerTokens OS
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot /var/www
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:/run/apache2
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#                            
+#Listen 12.34.56.78:80
+Listen 80
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+#LoadModule mpm_event_module modules/mod_mpm_event.so
+LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+#LoadModule mpm_worker_module modules/mod_mpm_worker.so
+LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule socache_redis_module modules/mod_socache_redis.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule echo_module modules/mod_echo.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule data_module modules/mod_data.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+LoadModule filter_module modules/mod_filter.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule deflate_module modules/mod_deflate.so
+#LoadModule brotli_module modules/mod_brotli.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule logio_module modules/mod_logio.so
+LoadModule env_module modules/mod_env.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
+#LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_crypto_module modules/mod_session_crypto.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule dialup_module modules/mod_dialup.so
+#LoadModule http2_module modules/mod_http2.so
+LoadModule unixd_module modules/mod_unixd.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule suexec_module modules/mod_suexec.so
+<IfModule !mpm_prefork_module>
+        #LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+<IfModule mpm_prefork_module>
+        #LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+#LoadModule rewrite_module modules/mod_rewrite.so
+
+LoadModule negotiation_module modules/mod_negotiation.so
+
+<IfModule unixd_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User apache
+Group apache
+
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin you@example.com
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory
+# listings, mod_status and mod_info output etc., but not CGI generated
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature On
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.                     
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/var/www/localhost/htdocs"
+<Directory "/var/www/localhost/htdocs">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   AllowOverride FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#                            
+ErrorLog logs/error.log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    #CustomLog logs/access.log common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    CustomLog logs/access.log combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to 
+    # exist in your server's namespace, but do not anymore. The client 
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/var/www/localhost/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock cgisock
+</IfModule>
+
+#
+# "/var/www/localhost/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/var/www/localhost/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule headers_module>
+    #
+    # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied
+    # backend servers which have lingering "httpoxy" defects.
+    # 'Proxy' request header is undefined by the IETF, not listed by IANA
+    #
+    RequestHeader unset Proxy early
+</IfModule>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig /etc/apache2/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #                        
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+<IfModule mime_magic_module>
+    MIMEMagicFile /etc/apache2/magic
+</IfModule>
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Load config files from the config directory "/etc/apache2/conf.d".
+#
+IncludeOptional /etc/apache2/conf.d/*.conf
+IncludeOptional /etc/apache2/conf.d/nine/*.conf

misc/tools/dicos.sh

@@ -0,0 +1,37 @@
+    dir=$1
+
+    if [ -f "$dir/dicos/.env.dicos" ]; then
+        dicos="$dir/dicos/.env.dicos"
+
+        # Exporter la variable
+        while IFS='=' read -r key value; do
+            export "$key"="$value"
+        done < $dir/env/.env.merge
+
+        # Initialisation des tableaux
+        templates=()
+        destinations=()
+
+        # Lecture du fichier de configuration
+        while IFS='=' read -r key value; do
+        case "$key" in
+            templates)
+            IFS=',' read -ra templates <<< "$value"
+            ;;
+            destinations)
+            IFS=',' read -ra destinations <<< "$value"
+            ;;
+            *)
+        esac
+        done < "$dicos"
+
+        # Boucle sur les templates et leurs destinations
+        for i in "${!templates[@]}"; do
+            template="${templates[$i]}"
+            destination="${destinations[$i]}"
+
+            # Copier le template vers l'emplacement de destination
+            cp "$template" "$destination"
+            envsubst < "$destination" > temp.conf && mv temp.conf "$destination"
+        done
+    fi

misc/tools/e-ihm.sh

@@ -184,3 +184,55 @@ Title(){
     EchoCyan "== $1 $finligne" 
     echo
 }
+
+# Fonction pour fusionner plusieurs fichiers .env
+mergeenv() {
+    # Vérifier si au moins deux fichiers .env sont fournis
+    if [ "$#" -lt 2 ]; then
+        echo "Usage: merge_env_files output_file .env_file1 .env_file2 [additional .env files...]"
+        return 1
+    fi
+
+    # Le premier argument est le fichier de sortie
+    output_file=$1
+    shift
+
+    # Déclaration des structures de données pour stocker les variables et maintenir l'ordre
+    declare -A env_vars
+    declare -a env_keys
+
+    # Fonction pour lire un fichier .env et mettre à jour les structures de données
+    read_env_file() {
+        local env_file=$1
+
+        # Lire chaque ligne du fichier .env
+        while IFS='=' read -r key value; do
+            # Ignorer les lignes vides et les commentaires
+            [[ -z "$key" || "$key" =~ ^# ]] && continue
+
+            # Vérifier si la variable existe déjà
+            if [[ -z "${env_vars[$key]}" ]]; then
+                # Ajouter la clé à la liste des clés si elle n'existe pas encore
+                env_keys+=("$key")
+            fi
+
+            # Mettre à jour le tableau associatif
+            env_vars["$key"]="$value"
+        done < "$env_file"
+    }
+
+    # Lire chaque fichier .env et mettre à jour les structures de données
+    for env_file in "$@"; do
+        if [ -f "$env_file" ]; then
+            read_env_file "$env_file"
+        fi
+    done
+
+    # Écrire les variables dans le fichier de sortie dans l'ordre d'apparition
+    {
+        for key in "${env_keys[@]}"; do
+            echo "$key=${env_vars[$key]}"
+        done
+    } > "$output_file"
+}
+

nine.sh

@@ -3,81 +3,65 @@
 #1 : action = default up
 #2 : service = optionnel
 
-# Fusionner l'ensemble des fichier .env en un seul
-rm -f ./.env.local
-cat ./env/.env* >> ./.env.local
-. ./misc/e-ihm.sh
-. ./env/.env
-if [ -f ./env/.env.local ]
-then
-    . ./env/.env.local
+# Include bibliotheque de fonction
+. ./misc/tools/e-ihm.sh
+
+# Include variable d'environnement global
+mergeenv env/.env.merge env/.env env/.env.local
+. env/.env.merge
+
+# Construction du docker-compose
+echo "services:" > docker-compose.yml
+
+# Include service
+declare -A services
+for dir in $(ls -d "services"/[0-9][0-9]-* | sort); do
+    keyservice="${dir##*-}"
+    valueservice="${dir##*/}"
+
+    # Include bibliotheque de fonction
+    if [ -f "$dir/misc/nine.sh" ]; then
+        . $dir/misc/nine.sh
     fi
 
+    # Include variable d'environnement global
+    if [ -f "$dir/env/.env" ]; then
+        . $dir/env/.env
+    fi
+
+    # Include variable d'environnement local
+    if [ -f "$dir/env/.env.local" ]; then
+        . $dir/env/.env.local
+    fi
+
+    # Construction du docker-compose
+    if [ -f "$dir/dockercompose/dockercompose.yml" ]; then
+        cat "$dir/dockercompose/dockercompose.yml" >> docker-compose.yml
+    fi
+
+    # Construction .env.merge
+    mergeenv $dir/env/.env.merge env/.env.merge $dir/env/.env $dir/env/.env.local
+
+    # Construction conf apache
+    if [ -f "$dir/apache/apache.conf" ]; then
+        cp "$dir/apache/apache.conf" services/10-nineapache/volume/apache/$valueservice.conf
+    fi
+
+    # Templetisation
+    misc/tools/dicos.sh $dir
+    
+    # Sauvegarder le service
+    services["$keyservice"]="$valueservice"    
+done
+
+# Construction du docker-compose
+echo "networks:" >> docker-compose.yml
+echo "  nine-network:" >> docker-compose.yml
+echo "    name: nine-network" >> docker-compose.yml
+
 # Start script
 BigTitle "NINE"
 
-# Include
-. ./.env.local
-
-#===========================================================================================================================================
-#== ENV ====================================================================================================================================
-#===========================================================================================================================================
-#1 = service to stop if null all service
-
-destroyall(){
-    Question_ouinon "Souhaitez-vous supprimer l'ensemble des containers : Attention cela supprimera vraiment tout  ?"
-    if [[ "$?" = 0 ]]
-    then
-        destroy $NINEAPACHE_SERVICE_NAME 1
-        destroy $MARIADB_SERVICE_NAME 1
-        destroy $REDIS_SERVICE_NAME 1
-        destroy $MINIO_SERVICE_NAME 1
-        destroy $OPENLDAP_SERVICE_NAME 1
-        destroy $KEYCLOAK_SERVICE_NAME 1
-        
-        destroy $NEXTCLOUD_SERVICE_NAME 1
-        destroy $NINEBOARD_SERVICE_NAME 1
-        destroy $NINEGATE_SERVICE_NAME 1
-        destroy $WIKI_SERVICE_NAME 1
-        destroy $WORDPRESS_SERVICE_NAME 1
-
-        destroy $ADMINER_SERVICE_NAME 1
-        destroy $PHPLDAPADMIN_SERVICE_NAME 1
-    fi
-}
-
-env() {
-    rm -rf ./tmp/.env.$1
-    mkdir -p ./tmp
-
-    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
-    if [[ -f ./env/.env.zapp.$1.local ]]; then cat ./env/.env.zapp.$1.local >> ./tmp/.env.$1; fi
-};
-
-#===========================================================================================================================================
-#== ENVALL =================================================================================================================================
-#===========================================================================================================================================
-
-envall(){
-    env $NINEAPACHE_SERVICE_NAME
-    env $MARIADB_SERVICE_NAME
-    env $REDIS_SERVICE_NAME
-    env $MINIO_SERVICE_NAME
-    env $OPENLDAP_SERVICE_NAME
-    env $KEYCLOAK_SERVICE_NAME
-
-    env $NEXTCLOUD_SERVICE_NAME
-    env $NINEBOARD_SERVICE_NAME
-    env $NINEGATE_SERVICE_NAME
-    env $WIKI_SERVICE_NAME
-    env $WORDPRESS_SERVICE_NAME
-    
-    env $ADMINER_SERVICE_NAME
-    env $PHPLDAPADMIN_SERVICE_NAME
-}
-
 #===========================================================================================================================================
 #== STOP ===================================================================================================================================
 #===========================================================================================================================================
@@ -87,7 +71,10 @@ envall(){
 stop() {
     if [[ "$2" != 1 ]]; then Title "STOP"; fi
 
+    echo "docker-compose stop $1"
     docker-compose stop $1
+
+    if [[ "$2" != 1 ]]; then echo; fi
 }
 
 #===========================================================================================================================================
@@ -114,208 +101,6 @@ wait_for_container() {
     done;
 }
 
-upservice(){
-    docker-compose up -d $1
-    if [[ $2 == "wait" ]]
-    then
-        wait_for_container $1
-    fi
-}
-
-function upnineapache {
-    if [[ $NINEAPACHE_ACTIVATE == 1 && $NINEAPACHE_LOCAL == 1 ]]
-    then
-        Title ${NINEAPACHE_SERVICE_NAME^^}
-        EchoVert "CONTAINER"
-        upservice ${NINEAPACHE_SERVICE_NAME}
-        Echo
-    fi      
-}
-
-function upmariadb {
-    if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-    then
-        Title "MARIADB"
-        EchoVert "CONTAINER"
-        upservice $MARIADB_SERVICE_NAME wait
-        Echo
-    fi
-}
-
-function upredis {
-    if [[ $REDIS_ACTIVATE == 1 && $REDIS_LOCAL == 1 ]]
-    then
-        Title "REDIS"
-        EchoVert "CONTAINER"
-        upservice $REDIS_SERVICE_NAME
-        Echo
-    fi
-}
-
-function upminio {
-    if [[ $MINIO_ACTIVATE == 1 && $MINIO_LOCAL == 1 ]]
-    then
-        Title "MINIO"
-        EchoVert "CONTAINER"
-        upservice $MINIO_SERVICE_NAME
-        Echo
-    fi
-}
-
-function upopenldap  {
-    if [[ $LDAP_ACTIVATE == 1 && $LDAP_LOCAL == 1 ]]
-    then
-        Title ${OPENLDAP_SERVICE_NAME^^}
-        EchoVert "CONTAINER"
-
-        mkdir -p ./volume/openldap/data
-        chmod a+wr ./volume/openldap/data
-        
-        upservice $OPENLDAP_SERVICE_NAME wait
-        docker-compose exec $OPENLDAP_SERVICE_NAME /nine/init.sh
-        Echo
-    fi
-}
-
-function upkeycloak {
-    if [[ $CAS_ACTIVATE == 1 && $CAS_LOCAL == 1 ]]
-    then
-        Title ${KEYCLOAK_SERVICE_NAME^^}
-
-        # CREATE BDD
-        if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-        then
-            EchoVert "DATABASE" 
-            Echo ${KEYCLOAK_SERVICE_NAME^^}
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $KEYCLOAK_SERVICE_NAME
-            Echo
-        fi
-
-        EchoVert "CONTAINER"
-        upservice $KEYCLOAK_SERVICE_NAME
-        Echo
-    fi
-}
-
-
-function upnextcloud {
-    if [[ $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]]
-    then
-        Title ${NEXTCLOUD_SERVICE_NAME^^}
-
-        if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-        then
-            EchoVert "DATABASE"
-            Echo ${NEXTCLOUD_SERVICE_NAME^^}
-            Echo
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NEXTCLOUD_SERVICE_NAME
-        fi
-
-        EchoVert "CONTAINER"
-        upservice ${NEXTCLOUD_SERVICE_NAME}
-        Echo
-    fi
-
-}
-
-function upnineboard {
-    if [[ $NINEBOARD_ACTIVATE == 1 && $NINEBOARD_LOCAL == 1 ]]
-    then
-        Title ${NINEBOARD_SERVICE_NAME^^}
-
-        if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-        then
-            EchoVert "DATABASE"
-            Echo ${NINEBOARD_SERVICE_NAME^^}
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NINEBOARD_SERVICE_NAME
-            Echo
-        fi
-
-        EchoVert "CONTAINER"
-        upservice ${NINEBOARD_SERVICE_NAME}
-        chmod -R a+wr ./volume/nineboard/data
-        Echo
-    fi    
-}
-
-function upninegate {
-    if [[ $NINEGATE_ACTIVATE == 1 && $NINEGATE_LOCAL == 1 ]]
-    then
-        Title ${NINEGATE_SERVICE_NAME^^}
-
-        if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-        then
-            EchoVert "DATABASE"
-            Echo ${NINEGATE_SERVICE_NAME^^}
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $NINEGATE_SERVICE_NAME
-            Echo
-        fi
-
-        EchoVert "CONTAINER"
-        upservice ${NINEGATE_SERVICE_NAME}
-        chmod -R a+wr ./volume/ninegate/data
-        Echo
-    fi    
-}
-
-function upwiki {
-    if [[ $WIKI_ACTIVATE == 1 && $WIKI_LOCAL == 1 ]]
-    then
-        Title ${WIKI_SERVICE_NAME^^}
-        
-        if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-        then
-            EchoVert "DATABASE"
-            Echo ${WIKI_SERVICE_NAME^^}
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $WIKI_SERVICE_NAME
-            Echo
-        fi   
-        
-        EchoVert "CONTAINER"
-        upservice ${WIKI_SERVICE_NAME}
-        Echo
-    fi    
-}
-
-function upwordpress {
-    if [[ $WORDPRESS_ACTIVATE == 1 && $WORDPRESS_LOCAL == 1 ]]
-    then
-        Title ${WORDPRESS_SERVICE_NAME^^}
-        
-        if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-        then
-            EchoVert "DATABASE"
-            Echo ${WORDPRESS_SERVICE_NAME^^}
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $WORDPRESS_SERVICE_NAME
-            Echo
-        fi   
-        
-        EchoVert "CONTAINER"
-        upservice ${WORDPRESS_SERVICE_NAME}
-        Echo
-    fi    
-}
-
-function upadminer {
-    if [[ $ADMINER_ACTIVATE == 1 && $ADMINER_LOCAL == 1 ]]
-    then
-        Title ${ADMINER_SERVICE_NAME^^}
-        EchoVert "CONTAINER"
-        upservice ${ADMINER_SERVICE_NAME}
-        Echo
-    fi  
-}
-
-function upphpldapadmin {
-    if [[ $PHPLDAPADMIN_ACTIVATE == 1 && $PHPLDAPADMIN_LOCAL == 1 ]]
-    then
-        Title ${PHPLDAPADMIN_SERVICE_NAME^^}
-        EchoVert "CONTAINER"
-        upservice ${PHPLDAPADMIN_SERVICE_NAME}
-        Echo
-    fi    
-}
-
 
 #===========================================================================================================================================
 #== UP =====================================================================================================================================
@@ -329,194 +114,51 @@ up(){
     # SERVICES
     if [[ -z "$1" ]]
     then
-        # NETWORK
-        if [[ "$RELEASE_SYSTEM" == "eole" ]]
-        then
-            Title "NETWORK"
-            EchoRouge "ATTENTION SOLUTION DE CONTOURNEMENT POUR LE POC"
-            EchoRouge "A résoudre si l'on souhaite mettre en production"
-            
-            # On réinstall docker-ce car le reconf détruit le reseau docker, la reinstall de docker-ce rétablit le reseau
-            apt-get install docker-ce --reinstall
-
-            # ATTENTION A REVOIR car ouvre complétement le firewall
-            iptables -P INPUT ACCEPT
-        fi
-
-
-        # NINEAPACHE
-        upnineapache  
-        
-        # MARIADB
-        upmariadb
-
-        # REDIS
-        upredis
-
-        # MINIO
-        upminio
-
-        # OPENLDAP
-        upopenldap
-
-        # KEYCLOAK
-        upkeycloak
-
-        # NEXTCLOUD
-        upnextcloud
-        
-        # NINEBOARD
-        upnineboard
-
-        # NINEGATE
-        upninegate
-
-        # WIKI
-        upwiki
-
-        # WORDPRESS
-        upwordpress
-
-        # ADMINER
-        upadminer      
-
-        # PHPLDAPADMIN
-        upphpldapadmin
-   
+        # Pour chaque répertoire service on execute sa fonction up
+        for key in $(for k in "${!services[@]}"; do echo "$k:${services[$k]}"; done | sort -t: -k2,2 | cut -d: -f1); do
+            up${key}
+        done
     else
-        env ${1}
         up${1}
     fi
 }
 
+upservice(){
+    docker-compose up -d --remove-orphans $1
+    if [[ $2 == "wait" ]]
+    then
+        wait_for_container $1
+    fi
+}
+
 #===========================================================================================================================================
-#== DESTROY ================================================================================================================================
+#== DESTROYALL =============================================================================================================================
 #===========================================================================================================================================
 
 destroyall(){
     Question_ouinon "Souhaitez-vous supprimer l'ensemble des containers : Attention cela supprimera vraiment tout  ?"
     if [[ "$?" = 0 ]]
     then
-        destroy $NINEAPACHE_SERVICE_NAME 1
-        destroy $MARIADB_SERVICE_NAME 1
-        destroy $REDIS_SERVICE_NAME 1
-        destroy $MINIO_SERVICE_NAME 1
-        destroy $OPENLDAP_SERVICE_NAME 1
-        destroy $KEYCLOAK_SERVICE_NAME 1
-        
-        destroy $NEXTCLOUD_SERVICE_NAME 1
-        destroy $NINEBOARD_SERVICE_NAME 1
-        destroy $NINEGATE_SERVICE_NAME 1
-        destroy $WIKI_SERVICE_NAME 1
-        destroy $WORDPRESS_SERVICE_NAME 1
-        
-        destroy $ADMINER_SERVICE_NAME 1
-        destroy $PHPLDAPADMIN_SERVICE_NAME 1
+        # Pour chaque répertoire service on execute sa fonction destroy
+        # On part du dernier service vers le premiser
+        for key in $(for k in "${!services[@]}"; do echo "$k:${services[$k]}"; done | sort -t: -k2,2r | cut -d: -f1); do
+            destroy${key} 1
+        done
     fi
 }
 
-#===========================================================================================================================================
-#== DESTROY ================================================================================================================================
-#===========================================================================================================================================
-#1 = service to destroy
-#2 = ne pas poser de questions
-
-destroy(){
-    Title "DESTROY "${1^^}
-
-    stop $1 1
-    docker-compose rm -s -v -f "$1"
-
-    if [[ "$1" == "$MARIADB_SERVICE_NAME" && $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
-    then
-        if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer l'ensemble des bases ?";fi
-        if [[ "$?" = 0 || -z $2 ]]
-        then
-            sudo rm -rf volume/mariadb/mysql
-        fi
-    fi  
-
-    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 ]]
-        then
-            sudo rm -rf volume/openldap/data
-            mkdir volume/openldap/data
-            chmod a+w volume/openldap/data -R
-            chmod a+r volume/openldap/data -R
-        fi
-    fi   
-
-    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
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $KEYCLOAK_SERVICE_NAME
-        fi
-    fi  
-
-    if [[ "$1" == "$NINEGATE_SERVICE_NAME" && $NINEGATE_ACTIVATE == 1 && $NINEGATE_LOCAL == 1 ]]
-    then
-        if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi
-        if [[ "$?" = 0 || -z $2 ]]
-        then
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $NINEGATE_SERVICE_NAME
-        fi
-    fi            
-
-    if [[ "$1" == "$NINEBOARD_SERVICE_NAME" && $NINEBOARD_ACTIVATE == 1 && $NINEBOARD_LOCAL == 1 ]]
-    then
-        if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi
-        if [[ "$?" = 0 || -z $2 ]]
-        then
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $NINEBOARD_SERVICE_NAME
-        fi
-    fi            
-
-    if [[ "$1" == "$NEXTCLOUD_SERVICE_NAME" && $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]]
-    then
-        if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ainsi que les fichiers utilisateurs ?";fi
-        if [[ "$?" = 0 || -z $2 ]]
-        then
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $NEXTCLOUD_SERVICE_NAME
-            sudo rm -rf volume/nextcloud/data
-            sudo rm -rf volume/nextcloud/html
-            sudo rm -rf volume/nextcloud/app
-        fi
-    fi 
-
-    if [[ "$1" == "$WIKI_SERVICE_NAME" && $WIKI_ACTIVATE == 1 && $WIKI_LOCAL == 1 ]]
-    then
-        if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi
-        if [[ "$?" = 0 || -z $2 ]]
-        then
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $WIKI_SERVICE_NAME
-            sudo rm -rf volume/wiki/data
-        fi
-    fi  
-
-    if [[ "$1" == "$WORDPRESS_SERVICE_NAME" && $WORDPRESS_ACTIVATE == 1 && $WORDPRESS_LOCAL == 1 ]]
-    then
-        if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi
-        if [[ "$?" = 0 || -z $2 ]]
-        then
-            docker-compose exec $MARIADB_SERVICE_NAME /nine/delete.sh $WORDPRESS_SERVICE_NAME
-            sudo rm -rf volume/wordpress/data
-        fi
-    fi                
-}
 
 #===========================================================================================================================================
 #== MAIN ===================================================================================================================================
 #===========================================================================================================================================
 
-envall
-
 if [[ $1 == "up" || $1 == "" ]]
 then
     up $2
+elif [[ $1 == "uplogs" || $1 == "" ]]
+then
+    up $2    
+    docker-compose logs -f $2
 elif  [[ $1 == "stop" ]]
 then
     stop $2
@@ -547,16 +189,6 @@ then
 elif [[ $1 == "iswait" ]]
 then
     wait_for_container $2
-elif  [[ $1 == "env" ]]
-then
-    if [[ -z $2 ]]
-    then
-        EchoRouge "Vous devez precisez un service"
-        EchoRouge "nine.sh env monservice"
-    else
-        env $2
-        EchoVert "Fichier tmp/.env.$1 regénéré"
-    fi
 elif [[ $1 == "regen" ]]
 then
     if [[ -z $2 ]]
@@ -572,6 +204,8 @@ else
     EchoRouge "nine.sh > UP de l'ensemble des services actifs"
     EchoRouge "nine.sh up > UP de l'ensemble des services actifs"
     EchoRouge "nine.sh up monservice> UP de monservice"
+    EchoRouge "nine.sh uplogs > UP puis logs de l'ensemble des services actifs"
+    EchoRouge "nine.sh uplogs monservice> UP puis logs de monservice"    
     EchoRouge "nine.sh stop > STOP de l'ensemble des services"
     EchoRouge "nine.sh stop monservice> STOP de monservice"
     EchoRouge "nine.sh bash monservice> lance un terminel dans le conteneur de monservice"
@@ -580,7 +214,6 @@ else
     EchoRouge "nine.sh logs > LOGS de l'ensemble des services"
     EchoRouge "nine.sh logs monservice > LOGS de monservice"
     EchoRouge "nine.sh iswait monservice > monservice est-il en cours de construction"
-    EchoRouge "nine.sh env monservice > regeneration du fichier d'environnement de monservice"
     EchoRouge "nine.sh regen > lance destroyall puis up sur l'ensemble des service"
     EchoRouge "nine.sh regen monservice > lance destroy monservice puis up monservice"
 

services/10-nineapache/apache/apache.conf

@@ -0,0 +1,35 @@
+LoadModule rewrite_module modules/mod_rewrite.so
+
+ServerName nineapache.local
+
+# Options Proxy
+ProxyRequests Off
+ProxyPreserveHost On
+
+<Proxy *>
+    Require all granted
+</Proxy>
+
+RequestHeader set X-Forwarded-Host "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-Server "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-For "%{REMOTE_ADDR}s"
+RequestHeader set Host "%{HTTP_HOST}s"
+RequestHeader set X-Forwarded-Proto "http"
+
+# Page interne au proxy
+DocumentRoot "/app/public"
+<Directory "/app/public">
+    Options Indexes FollowSymLinks
+    AllowOverride All
+    Require all granted
+
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$
+    RewriteRule .* - [E=BASE:%1]
+    RewriteCond %{HTTP:Authorization} .+
+    RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
+    RewriteCond %{ENV:REDIRECT_STATUS} =""
+    RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ %{ENV:BASE}/index.php [L]
+</Directory>

services/10-nineapache/dockercompose/dockercompose.yml

@@ -0,0 +1,19 @@
+
+  # Nineapache
+  # Reverse proxy de l'ensemble des services
+  # Seul port ouvert sur l'exterieur
+  nineapache:
+    image: reg.cadoles.com/envole/nineapache:8.1
+    container_name: nine-nineapache
+    restart: unless-stopped
+    healthcheck:
+      test: curl --fail http://localhost || exit 1
+      interval: 1s
+      timeout: 60s      
+    env_file: ./services/10-nineapache/env/.env.merge
+    networks:
+      - nine-network
+    ports:
+      - "80:80"  
+    volumes:
+      - ./services/10-nineapache/volume/apache:/etc/apache2/conf.d/nine

services/10-nineapache/misc/nine.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+function upnineapache {
+    if [[ $NINEAPACHE_ACTIVATE == 1 && $NINEAPACHE_LOCAL == 1 ]]
+    then
+        Title ${NINEAPACHE_SERVICE_NAME^^}
+        EchoVert "CONTAINER"
+        upservice ${NINEAPACHE_SERVICE_NAME}
+        Echo
+    fi      
+}
+
+function destroynineapache {
+    if [[ $NINEAPACHE_LOCAL == 1 ]]
+    then
+        Title "DESTROY ${NINEAPACHE_SERVICE_NAME}"
+
+        stop ${NINEAPACHE_SERVICE_NAME} 1
+        docker-compose rm -s -v -f "${NINEAPACHE_SERVICE_NAME}"    
+        rm -rf services/10-nineapache/volume/apache
+        echo ""
+    fi
+}

services/15-mariadb/dockercompose/dockercompose.yml

@@ -0,0 +1,18 @@
+
+  # Mariadb
+  # Base de données des services
+  # Port interne 3306
+  mariadb:
+    image: docker.io/library/mariadb
+    container_name: nine-mariadb
+    restart: unless-stopped
+    healthcheck:
+      test: /nine/check.sh    
+      interval: 1s
+      timeout: 60s      
+    env_file: ./services/15-mariadb/env/.env.merge
+    networks:
+      - nine-network
+    volumes:
+      - ./services/15-mariadb/volume/mysql:/var/lib/mysql
+      - ./services/15-mariadb/volume/nine:/nine

services/15-mariadb/misc/nine.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+
+
+function upmariadb {
+    if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
+    then
+        Title "MARIADB"
+        EchoVert "CONTAINER"
+        upservice $MARIADB_SERVICE_NAME wait
+        Echo
+    fi
+}
+
+function destroymariadb(){
+    if [[ $MARIADB_LOCAL == 1 ]]
+    then
+        Title "DESTROY $MARIADB_SERVICE_NAME"
+
+        stop $MARIADB_SERVICE_NAME 1
+        docker-compose rm -s -v -f "$MARIADB_SERVICE_NAME"
+    
+        if [[ -z $1 ]]; then 
+            Question_ouinon "Souhaitez-vous supprimer l'ensemble des bases ?";
+            response=$?
+        fi
+        if [[ "$response" == 0 || ! -z $1 ]]
+        then
+            EchoRouge "Suppression de l'ensemble des bases"
+            sudo rm -rf services/15-mariadb/volume/mysql
+        fi
+
+        echo ""
+    fi  
+}

services/15-mariadb/volume/nine/init.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+mariadb -u root -p$MARIADB_ROOT_PASSWORD -e "CREATE DATABASE IF NOT EXISTS $1;"
+mariadb -u root -p$MARIADB_ROOT_PASSWORD -e "GRANT ALL PRIVILEGES ON $1.* TO '$MARIADB_USER'@'%';"

services/30-minio/apache/apache.conf

@@ -0,0 +1,9 @@
+
+# Minio = pour l'instant je n'arrive pas à faire fonctionner la console minio derrière un proxy
+#ProxyPass /minio http://minio:9001 retry=0 keepalive=On
+#ProxyPassReverse /minio http://minio:9001 retry=0
+#RewriteEngine On
+#RewriteCond %{HTTP:Upgrade} =websocket [NC]
+#RewriteRule /minio/(.*) ws://minio:9001/$1 [P,L]
+#RewriteCond %{HTTP:Upgrade} !=websocket [NC]
+#RewriteRule /minio/(.*) http://minio:9001/$1 [P,L]

services/30-minio/dockercompose/dockercompose.yml

@@ -0,0 +1,15 @@
+
+  # Minio
+  # Stocakge S3
+  # Port interne 9000 pour le stockage / Port interne 9001 pour l'interface web
+  minio:
+    image: bitnami/minio
+    container_name: nine-minio
+    restart: unless-stopped      
+    env_file: ./services/30-minio/env/.env.merge
+    ports:
+      - "9001:9001"      
+    networks:
+      - nine-network
+    volumes:
+      - './services/30-minio/volume/data:/data'

services/30-minio/env/.env

@@ -4,4 +4,10 @@
 MINIO_ROOT_USER=${ADMIN_USER}
 MINIO_ROOT_PASSWORD=${ADMIN_PASSWORD}
 MINIO_DEFAULT_BUCKETS=nine
+MINIO_API_PORT_NUMBER=9000
+MINIO_CONSOLE_PORT_NUMBER=9001
 
+#MINIO_SERVER_URL="${PROTOCOLE}://${WEB_URL}"
+#MINIO_BROWSER_REDIRECT_URL="${MINIO_URL}"
+#MINIO_SCHEME=${PROTOCOLE}
+#BITNAMI_DEBUG=true

services/30-minio/misc/nine.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+function upminio {
+    if [[ $MINIO_ACTIVATE == 1 && $MINIO_LOCAL == 1 ]]
+    then
+        Title "MINIO"
+        EchoVert "CONTAINER"
+        upservice $MINIO_SERVICE_NAME
+        Echo
+    fi
+}
+
+function destroyminio(){
+    if [[ $MINIO_LOCAL == 1 ]]
+    then
+        Title "DESTROY $MINIO_SERVICE_NAME"
+
+        stop $MINIO_SERVICE_NAME 1
+        docker-compose rm -s -v -f "$MINIO_SERVICE_NAME"  
+
+        if [[ -z $1 ]]; then 
+            Question_ouinon "Souhaitez-vous supprimer les fichiers stockés dans $MINIO_SERVICE_NAME ?";
+            response=$?
+        fi
+        if [[ "$response" == 0 || ! -z $1 ]]
+        then
+            EchoRouge "Suppression des fichiers stockés sur $MINIO_SERVICE_NAME"
+            sudo rm -rf ./services/30-minio/volume/data
+        fi
+
+        echo ""
+   fi  
+}

services/30-openldap/dockercompose/dockercompose.yml

@@ -0,0 +1,18 @@
+
+  # Openldap
+  # Annuaire
+  # Port interne 1389 & 1636
+  openldap:
+    image: docker.io/bitnami/openldap:2
+    container_name: nine-openldap
+    restart: unless-stopped
+    healthcheck:
+      test: /nine/check.sh    
+      interval: 1s
+      timeout: 60s     
+    env_file: ./services/30-openldap/env/.env.merge
+    networks:
+      - nine-network
+    volumes:
+      - './services/30-openldap/volume/data:/bitnami/openldap'
+      - './services/30-openldap/volume/nine:/nine'

services/30-openldap/misc/nine.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+function upopenldap  {
+    if [[ $OPENLDAP_ACTIVATE == 1 && $OPENLDAP_LOCAL == 1 ]]
+    then
+        Title ${OPENLDAP_SERVICE_NAME^^}
+        EchoVert "CONTAINER"
+
+        mkdir -p ./services/30-openldap/volume/data
+        chmod a+wr ./services/30-openldap/volume/data
+        
+        upservice $OPENLDAP_SERVICE_NAME wait
+        docker-compose exec $OPENLDAP_SERVICE_NAME /nine/init.sh
+        Echo
+    fi
+}
+
+function destroyopenldap {
+    if [[ $OPENLDAP_LOCAL == 1 ]]
+    then
+        Title "DESTROY $OPENLDAP_SERVICE_NAME"
+
+        stop $OPENLDAP_SERVICE_NAME 1
+        docker-compose rm -s -v -f "$OPENLDAP_SERVICE_NAME"
+
+        if [[ -z $1 ]]; then 
+            Question_ouinon "Souhaitez-vous supprimer l'annuaire associé à $OPENLDAP_SERVICE_NAME ?";
+            response=$?
+        fi
+        if [[ "$response" == 0 || ! -z $1 ]]
+        then
+            EchoRouge "Suppression de l'annuaire"
+            rm -rf ./services/30-openldap/volume/data
+        fi
+
+        echo ""
+    fi   
+}

services/30-redis/dockercompose/dockercompose.yml

@@ -0,0 +1,12 @@
+
+  # Redis
+  # Base de données redis pour les services qui souhaitent stocker leur session en bdd
+  # Port interne 6379
+  redis:
+    image: redis:4.0
+    container_name: nine-redis
+    env_file: ./services/30-redis/env/.env.merge
+    networks:
+      - nine-network    
+    environment:
+      - TZ=Europe/Paris

services/30-redis/env/.env

@@ -0,0 +1,3 @@
+
+# == REDIS ================================================================================================================================
+

services/30-redis/misc/nine.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+function upredis {
+    if [[ $REDIS_ACTIVATE == 1 && $REDIS_LOCAL == 1 ]]
+    then
+        Title "REDIS"
+        EchoVert "CONTAINER"
+        upservice $REDIS_SERVICE_NAME
+        Echo
+    fi
+}
+
+function destroyredis(){
+    if [[ $REDIS_LOCAL == 1 ]]
+    then
+        Title "DESTROY $REDIS_SERVICE_NAME"
+
+        stop $REDIS_SERVICE_NAME 1
+        docker-compose rm -s -v -f "$REDIS_SERVICE_NAME"  
+
+        echo ""
+   fi  
+}

services/40-keycloak/apache/apache.conf

@@ -0,0 +1,4 @@
+
+# Keycloak
+ProxyPass /auth http://keycloak:8999/auth retry=0 keepalive=On
+ProxyPassReverse /auth http://keycloak:8999/auth retry=0

services/40-keycloak/dockercompose/dockercompose.yml

@@ -0,0 +1,23 @@
+
+  # Keycloak
+  # serveur SSO
+  # Port interne 8999 & 8443
+  keycloak:
+    image: reg.cadoles.com/envole/keycloak:24.0.5
+    container_name: nine-keycloak
+    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
+    ports:
+      - 8999:8999
+      - 8443:8443
+    volumes:
+      - './volume/keycloak/nine:/nine'
+    command:
+      - start-dev
+      - --import-realm

services/40-keycloak/misc/nine.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+function upkeycloak {
+    if [[ $KEYCLOAK_ACTIVATE == 1 && $KEYCLOAK_LOCAL == 1 ]]
+    then
+        Title ${KEYCLOAK_SERVICE_NAME^^}
+
+        # CREATE BDD
+        if [[ $MARIADB_ACTIVATE == 1 && $MARIADB_LOCAL == 1 ]]
+        then
+            EchoVert "DATABASE" 
+            Echo ${KEYCLOAK_SERVICE_NAME^^}
+            docker-compose exec $MARIADB_SERVICE_NAME /nine/init.sh $KEYCLOAK_SERVICE_NAME
+            Echo
+        fi
+
+        EchoVert "CONTAINER"
+        upservice $KEYCLOAK_SERVICE_NAME
+        Echo
+    fi
+}
+
+function destroykeycloak {
+    if [[ $KEYCLOAK_LOCAL == 1 ]]
+    then    
+        Title "DESTROY ${KEYCLOAK_SERVICE_NAME}"
+
+        stop ${KEYCLOAK_SERVICE_NAME} 1
+        docker-compose rm -s -v -f "${KEYCLOAK_SERVICE_NAME}"    
+
+        if [[ -z $1 ]]; then 
+            Question_ouinon "Souhaitez-vous supprimer la BDD associé à $KEYCLOAK_SERVICE_NAME ?";
+            response=$?
+        fi
+        if [[ "$response" == 0 || ! -z $1 ]]
+        then
+            EchoRouge "Delete BDD = $KEYCLOAK_SERVICE_NAME"
+            docker-compose exec $KEYCLOAK_SERVICE_NAME /nine/delete.sh $KEYCLOAK_SERVICE_NAME
+        fi
+
+        echo ""
+    fi
+}

services/50-dokuwiki/apache/apache.conf

@@ -0,0 +1,5 @@
+
+# Dokuwiki
+ProxyPass /dokuwiki http://dokuwiki retry=0 keepalive=On
+ProxyPassReverse /dokuwiki http://dokuwiki retry=0
+

services/50-dokuwiki/dockercompose/dockercompose.yml

@@ -0,0 +1,12 @@
+
+  # Dokuwiki
+  # Wiki
+  # Port interne 80
+  wiki:
+    image: linuxserver/dokuwiki
+    container_name: nine-dokuwiki
+    env_file: ./services/50-dokuwiki/env/.env.merge
+    networks:
+      - nine-network
+    ports:
+      - 9000:80

services/50-dokuwiki/misc/nine.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+function updokuwiki {
+    if [[ $DOKUWIKI_ACTIVATE == 1 && $DOKUWIKI_LOCAL == 1 ]]
+    then
+        Title ${DOKUWIKI_SERVICE_NAME^^}
+               
+        EchoVert "CONTAINER"
+        upservice ${DOKUWIKI_SERVICE_NAME}
+        Echo
+    fi    
+}
+
+function destroydokuwiki {
+    if [[ $DOKUWIKI_LOCAL == 1 ]]
+    then    
+        Title "DESTROY ${DOKUWIKI_SERVICE_NAME}"
+
+        stop ${DOKUWIKI_SERVICE_NAME} 1
+        docker-compose rm -s -v -f "${DOKUWIKI_SERVICE_NAME}"    
+
+        if [[ -z $1 ]]; then 
+            Question_ouinon "Souhaitez-vous purger $DOKUWIKI_SERVICE_NAME ?";
+            response=$?
+        fi
+        if [[ "$response" == 0 || ! -z $1 ]]
+        then
+            EchoRouge "Purge = $DOKUWIKI_SERVICE_NAME"
+            rm -rf services/50-dokuwiki/volume/data
+        fi
+
+        echo ""
+    fi
+}

services/50-nextcloud/apache/apache.conf

@@ -0,0 +1,5 @@
+
+# Nextcloud
+ProxyPass /nextcloud http://nextcloud retry=0 keepalive=On
+ProxyPassReverse /nextcloud http://nextcloud retry=0
+

services/50-nextcloud/dockercompose/dockercompose.yml

@@ -0,0 +1,21 @@
+
+  # Nextcloud
+  # Hébergement de fichiers et une plateforme de collaboration
+  # Port interne 80
+  nextcloud:
+    image: reg.cadoles.com/envole/nextcloud
+    container_name: nine-nextcloud
+    restart: unless-stopped
+    healthcheck:
+      test: curl --fail http://localhost || exit 1    
+      interval: 1s
+      timeout: 60s      
+    env_file: ./services/50-nextcloud/env/.env.merge
+    networks:
+      - nine-network
+    volumes:
+      - ./services/50-nextcloud/volume/html:/var/www/html
+      - ./services/50-nextcloud/volume/app:/var/www/html/custom_apps
+      - ./services/50-nextcloud/volume/data:/var/www/html/data
+      - ./services/50-nextcloud/volume/nine:/nine
+      - ./services/50-nextcloud/volume/prestart:/docker-entrypoint-hooks.d/before-starting

services/50-nextcloud/misc/nine.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+function upnextcloud {
+    if [[ $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]]
+    then
+        Title ${NEXTCLOUD_SERVICE_NAME^^}
+               
+        EchoVert "CONTAINER"
+        upservice ${NEXTCLOUD_SERVICE_NAME}
+        Echo
+    fi    
+}
+
+function destroynextcloud {
+    if [[ $NEXTCLOUD_LOCAL == 1 ]]
+    then    
+        Title "DESTROY ${NEXTCLOUD_SERVICE_NAME}"
+
+        stop ${NEXTCLOUD_SERVICE_NAME} 1
+        docker-compose rm -s -v -f "${NEXTCLOUD_SERVICE_NAME}"    
+
+        if [[ -z $1 ]]; then 
+            Question_ouinon "Souhaitez-vous purger $NEXTCLOUD_SERVICE_NAME ?";
+            response=$?
+        fi
+        if [[ "$response" == 0 || ! -z $1 ]]
+        then
+            EchoRouge "Purge = $NEXTCLOUD_SERVICE_NAME"
+            rm -rf services/50-nextcloud/volume/data
+            rm -rf services/50-nextcloud/volume/html
+            rm -rf services/50-nextcloud/volume/app
+        fi
+
+        echo ""
+    fi
+}