diff --git a/dicos/90_envole.xml b/dicos/90_envole.xml
index 65052ac..3a37f30 100644
--- a/dicos/90_envole.xml
+++ b/dicos/90_envole.xml
@@ -62,6 +62,9 @@
non
non
+ non
+
+
non
non
@@ -75,6 +78,9 @@
+ oui
+
+
oui
oui
@@ -102,6 +108,9 @@
DOMSCRIBE
nextcloud
+
+ oui
+
@@ -111,9 +120,10 @@
Annuaire
Applications
Secrets
- Ninegate Portail
+ Ninegate
Nineboard
Nextcloud
+ Wordpress
@@ -201,6 +211,7 @@
activer_ninegate
activer_nineboard
activer_nextcloud
+ activer_wordpress
activer_adminer
@@ -249,7 +260,13 @@
non
+ ninegate_local
ninegate_secret
+
+
+
+ non
+
ninegate_syncldap
ninegate_ssosynchrogroup
ninegate_ssoreqgroup
@@ -267,6 +284,12 @@
ninegate_forcethemename
+
+ oui
+
+ ninegate_url
+
+
non
nineboard_secret
@@ -349,6 +372,20 @@
nextcloud_samba_host
nextcloud_samba_domaine
nextcloud_samba_name
-
+
+
+
+
+
+ non
+
+ wordpress_local
+
+
+
+ oui
+
+ wordpress_url
+
\ No newline at end of file
diff --git a/docker/.gitignore b/docker/.gitignore
index bb95248..d3cc4c1 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -1,5 +1,6 @@
.env.local
/env/*.local
+/tmp
/volume/mariadb/mysql
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 7295a8d..facc7e7 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,7 +9,7 @@ services:
test: /envole/check.sh
interval: 1s
timeout: 60s
- env_file: ./.env.local
+ env_file: ./tmp/.env.mariadb
networks:
- envole-network
ports:
@@ -26,7 +26,7 @@ services:
test: /envole/check.sh
interval: 1s
timeout: 60s
- env_file: ./.env.local
+ env_file: ./tmp/.env.openldap
networks:
- envole-network
ports:
@@ -51,7 +51,7 @@ services:
test: curl --fail http://127.0.0.1:9990 || exit 1
interval: 1s
timeout: 60s
- env_file: ./.env.local
+ env_file: ./tmp/.env.keycloak
networks:
- envole-network
ports:
@@ -69,7 +69,7 @@ services:
test: curl --fail http://localhost/ninegate || exit 1
interval: 1s
timeout: 60s
- env_file: ./.env.local
+ env_file: ./tmp/.env.ninegate
networks:
- envole-network
ports:
@@ -86,7 +86,7 @@ services:
test: curl --fail http://localhost || exit 1
interval: 1s
timeout: 60s
- env_file: ./.env.local
+ env_file: ./tmp/.env.nextcloud
networks:
- envole-network
ports:
@@ -106,7 +106,7 @@ services:
test: curl --fail http://localhost/nineboard || exit 1
interval: 1s
timeout: 60s
- env_file: ./.env.local
+ env_file: ./tmp/.env.nineboard
networks:
- envole-network
ports:
@@ -115,11 +115,27 @@ services:
- ./volume/nineboard/data/private:/app/uploads
- ./volume/nineboard/data/public:/app/public/uploads
+ wordpress:
+ image: wordpress
+ container_name: envole-wordpress
+ restart: always
+ healthcheck:
+ test: curl --fail http://localhost/wordpress || exit 1
+ interval: 1s
+ timeout: 60s
+ env_file: ./tmp/.env.wordpress
+ networks:
+ - envole-network
+ ports:
+ - "9003:80"
+ volumes:
+ - ./volume/wordpress/data:/var/www/html
+
adminer:
image: docker.io/library/adminer
container_name: envole-adminer
restart: always
- env_file: ./.env.local
+ env_file: ./tmp/.env.adminer
networks:
- envole-network
ports:
@@ -129,7 +145,7 @@ services:
image: docker.io/osixia/phpldapadmin:latest
container_name: envole-phpldapadmin
restart: always
- env_file: ./.env.local
+ env_file: ./tmp/.env.phpldapadmin
networks:
- envole-network
ports:
@@ -143,7 +159,7 @@ services:
test: curl --fail http://localhost || exit 1
interval: 1s
timeout: 60s
- env_file: ./.env.local
+ env_file: ./tmp/.env.nineapache
networks:
- envole-network
ports:
diff --git a/docker/env/.env b/docker/env/.env
index cabb85d..2564498 100644
--- a/docker/env/.env
+++ b/docker/env/.env
@@ -93,6 +93,12 @@ NINEBOARD_ACTIVATE=1
NINEBOARD_LOCAL=1
NINEBOARD_URL=${PROTOCOLE}://${WEB_URL}:9002
+# WORDPRESS
+WORDPRESS_SERVICE_NAME=nineboard
+WORDPRESS_ACTIVATE=1
+WORDPRESS_LOCAL=1
+WORDPRESS_URL=${PROTOCOLE}://${WEB_URL}:9003
+
# ADMINER
ADMINER_SERVICE_NAME=adminer
ADMINER_ACTIVATE=0
diff --git a/docker/env/.env.zapp.wordpress b/docker/env/.env.zapp.wordpress
new file mode 100644
index 0000000..1077a7e
--- /dev/null
+++ b/docker/env/.env.zapp.wordpress
@@ -0,0 +1,8 @@
+
+# == NEXTCLOUD ============================================================================================================================
+
+WORDPRESS_DB_HOST=mariadb
+WORDPRESS_DB_NAME=wordpress
+WORDPRESS_DB_USER=${MARIADB_USER}
+WORDPRESS_DB_PASSWORD=${MARIADB_PASSWORD}
+
diff --git a/docker/envole.sh b/docker/envole.sh
index b773a9b..3338709 100755
--- a/docker/envole.sh
+++ b/docker/envole.sh
@@ -53,7 +53,54 @@ fi
# 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 $MARIADB_SERVICE_NAME 1
+ destroy $OPENLDAP_SERVICE_NAME 1
+ destroy $KEYCLOAK_SERVICE_NAME 1
+ destroy $NINEGATE_SERVICE_NAME 1
+ destroy $NINEBOARD_SERVICE_NAME 1
+ destroy $NEXTCLOUD_SERVICE_NAME 1
+ destroy $WORDPRESS_SERVICE_NAME 1
+ destroy $ADMINER_SERVICE_NAME 1
+ destroy $PHPLDAPADMIN_SERVICE_NAME 1
+ destroy $NINEAPACHE_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 $MARIADB_SERVICE_NAME
+ env $OPENLDAP_SERVICE_NAME
+ env $KEYCLOAK_SERVICE_NAME
+ env $NINEGATE_SERVICE_NAME
+ env $NINEBOARD_SERVICE_NAME
+ env $NEXTCLOUD_SERVICE_NAME
+ env $WORDPRESS_SERVICE_NAME
+ env $ADMINER_SERVICE_NAME
+ env $PHPLDAPADMIN_SERVICE_NAME
+ env $NINEAPACHE_SERVICE_NAME
+}
#===========================================================================================================================================
#== STOP ===================================================================================================================================
@@ -124,6 +171,9 @@ up(){
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
@@ -162,6 +212,12 @@ up(){
EchoVert ${NEXTCLOUD_SERVICE_NAME^^}
$PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/init.sh $NEXTCLOUD_SERVICE_NAME
fi
+
+ if [[ $WORDPRESS_ACTIVATE == 1 && $WORDPRESS_LOCAL == 1 ]]
+ then
+ EchoVert ${WORDPRESS_SERVICE_NAME^^}
+ $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/init.sh $WORDPRESS_SERVICE_NAME
+ fi
fi
# OPENLDAP
@@ -211,6 +267,14 @@ up(){
echo
fi
+ # WORDPRESS
+ if [[ $WORDPRESS_ACTIVATE == 1 && $WORDPRESS_LOCAL == 1 ]]
+ then
+ Title ${WORDPRESS_SERVICE_NAME^^}
+ upservice ${WORDPRESS_SERVICE_NAME}
+ echo
+ fi
+
# ADMINER
if [[ $ADMINER_ACTIVATE == 1 && $ADMINER_LOCAL == 1 ]]
then
@@ -236,6 +300,7 @@ up(){
fi
else
Title ${1^^}
+ env ${NINEAPACHE_SERVICE_NAME}
$PODCOMPOSEBIN up -d $1
fi
}
@@ -248,15 +313,16 @@ destroyall(){
Question_ouinon "Souhaitez-vous supprimer l'ensemble des containers : Attention cela supprimera vraiment tout ?"
if [[ "$?" = 0 ]]
then
- destroy mariadb 1
- destroy openldap 1
- destroy keycloak 1
- destroy ninegate 1
- destroy nineboard 1
- destroy nextcloud 1
- destroy adminer 1
- destroy phpldapadmin 1
- destroy nineapache 1
+ destroy $MARIADB_SERVICE_NAME 1
+ destroy $OPENLDAP_SERVICE_NAME 1
+ destroy $KEYCLOAK_SERVICE_NAME 1
+ destroy $NINEGATE_SERVICE_NAME 1
+ destroy $NINEBOARD_SERVICE_NAME 1
+ destroy $NEXTCLOUD_SERVICE_NAME 1
+ destroy $WORDPRESS_SERVICE_NAME 1
+ destroy $ADMINER_SERVICE_NAME 1
+ destroy $PHPLDAPADMIN_SERVICE_NAME 1
+ destroy $NINEAPACHE_SERVICE_NAME 1
fi
}
@@ -334,13 +400,24 @@ destroy(){
sudo rm -rf volume/nextcloud/html
sudo rm -rf volume/nextcloud/app
fi
- 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
+ $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/delete.sh $WORDPRESS_SERVICE_NAME
+ fi
+ fi
}
#===========================================================================================================================================
#== MAIN ===================================================================================================================================
#===========================================================================================================================================
+envall
+
if [[ $1 == "up" || $1 == "" ]]
then
up $2
@@ -376,7 +453,35 @@ then
wait_for_container $2
elif [[ $1 == "env" ]]
then
- EchoVert "Fichier .env.local regénéré"
+ if [[ -z $2 ]]
+ then
+ EchoRouge "Vous devez precisez un service"
+ EchoRouge "envole.sh env monservice"
+ else
+ env $2
+ EchoVert "Fichier tmp/.env.$1 regénéré"
+ fi
+else
+ EchoRouge "Action possible ="
+ EchoRouge "envole.sh > UP de l'ensemble des services actifs"
+ EchoRouge "envole.sh up > UP de l'ensemble des services actifs"
+ EchoRouge "envole.sh up monservice> UP de monservice"
+ EchoRouge "envole.sh stop > STOP de l'ensemble des services"
+ EchoRouge "envole.sh stop monservice> STOP de monservice"
+ EchoRouge "envole.sh bash monservice> lance un terminel dans le conteneur de monservice"
+ EchoRouge "envole.sh destroyall> détruit l'ensemble des services avec l'ensemble des BDD et des volumes persistant"
+ EchoRouge "envole.sh destroy monservice> détruit monservices et si souhaitez sa BDD et ses volumes persistant"
+ EchoRouge "envole.sh logs > LOGS de l'ensemble des services"
+ EchoRouge "envole.sh logs monservice > LOGS de monservice"
+ EchoRouge "envole.sh iswait monservice > monservice est-il en cours de construction"
+ EchoRouge "envole.sh env monservice > regeneration du fichier d'environnement de monservice"
+
+
+
+
+
+
+
fi
echo
echo
\ No newline at end of file
diff --git a/docker/volume/mariadb/envole/wordpress.sql b/docker/volume/mariadb/envole/wordpress.sql
new file mode 100644
index 0000000..728952c
--- /dev/null
+++ b/docker/volume/mariadb/envole/wordpress.sql
@@ -0,0 +1 @@
+CREATE DATABASE IF NOT EXISTS wordpress;
\ No newline at end of file
diff --git a/misc/tools/e-reconfigure.sh b/misc/tools/e-reconfigure.sh
index 767794b..dd45dac 100755
--- a/misc/tools/e-reconfigure.sh
+++ b/misc/tools/e-reconfigure.sh
@@ -16,7 +16,7 @@ for f in $FILES
do
if [ -f "$f" ]
then
- EchoRouge $(basename $f)
+ EchoVert $(basename $f)
CreoleCat -t $(basename $f)
fi
done
diff --git a/misc/wordpress/containers/volume/entrypoint.sh b/misc/wordpress/containers/volume/entrypoint.sh
new file mode 100755
index 0000000..7e4e34f
--- /dev/null
+++ b/misc/wordpress/containers/volume/entrypoint.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+set -eo pipefail
+
+cd /app/public
+
+
+if [[ ! -f /app/public/wp-config.php ]]
+then
+ wp config create \
+ --allow-root \
+ --dbhost="${WORDPRESS_DB_HOST}" \
+ --dbname="${WORDPRESS_DB_NAME}" \
+ --dbuser="${WORDPRESS_DB_USER}" \
+ --dbpass="${WORDPRESS_DB_PASSWORD}" \
+ --dbcharset="utf8mb4" \
+ --locale="fr_FR"
+fi
+
+wp core multisite-install \
+ --allow-root \
+ --url="${WORDPRESS_PROTOCOL}://${WORDPRESS_DOMAINE}" \
+ --title="${WORDPRESS_TITLE}" \
+ --admin_user="${WORDPRESS_USER}" \
+ --admin_password="${WORDPRESS_PASSWORD}" \
+ --admin_email="${WORDPRESS_EMAIL}" \
+ --skip-email
+
+wp config set --allow-root DB_HOST ${WORDPRESS_DB_HOST}
+wp config set --allow-root DB_NAME ${WORDPRESS_DB_NAME}
+wp config set --allow-root DB_USER ${WORDPRESS_DB_USER}
+wp config set --allow-root DB_PASSWORD ${WORDPRESS_DB_PASSWORD}
+
+wp config set --allow-root WP_HOME ${WORDPRESS_PROTOCOL}://${WORDPRESS_DOMAINE}${WORDPRESS_ALIAS}
+wp config set --allow-root WP_SITEURL ${WORDPRESS_PROTOCOL}://${WORDPRESS_DOMAINE}${WORDPRESS_ALIAS}
+
+wp config set --allow-root WP_ALLOW_MULTISITE true
+wp config set --allow-root MULTISITE true
+wp config set --allow-root SUBDOMAIN_INSTALL false
+wp config set --allow-root DOMAIN_CURRENT_SITE ${WORDPRESS_DOMAINE}
+wp config set --allow-root PATH_CURRENT_SITE ${WORDPRESS_ALIAS}
+wp config set --allow-root FORCE_ADMIN_SSL false
+
+
+# On fait croire à WP qu'il est en https
+if grep -qF "_SERVER['HTTPS']='on'" "wp-config.php"; then
+ if [[ "${WORDPRESS_PROTOCOL}" == "https" ]]
+ then
+ echo "FORCE HTTPS already set"
+ fi
+else
+ if [[ "${WORDPRESS_PROTOCOL}" == "https" ]]
+ then
+ echo "FORCE HTTPS set"
+ head -n 1 "wp-config.php" > "wp-config.tmp"
+ echo "\$_SERVER['HTTPS']='on';" >> "wp-config.tmp"
+ tail -n +2 "wp-config.php" >> "wp-config.tmp"
+ mv "wp-config.tmp" "wp-config.php"
+ fi
+fi
+
+exec $@
\ No newline at end of file
diff --git a/misc/wordpress/containers/wordpress/.htaccess b/misc/wordpress/containers/wordpress/.htaccess
new file mode 100644
index 0000000..92957af
--- /dev/null
+++ b/misc/wordpress/containers/wordpress/.htaccess
@@ -0,0 +1,11 @@
+RewriteEngine On
+
+RewriteBase /
+RewriteRule ^index\.php$ - [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
+RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
+RewriteRule . index.php [L]
\ No newline at end of file
diff --git a/misc/wordpress/containers/wordpress/Dockerfile b/misc/wordpress/containers/wordpress/Dockerfile
new file mode 100755
index 0000000..dab5142
--- /dev/null
+++ b/misc/wordpress/containers/wordpress/Dockerfile
@@ -0,0 +1,23 @@
+FROM reg.cadoles.com/envole/nineapache:8.1
+
+# Paquet necessaire pour wordpress
+RUN apk add php81-mysqli
+
+# Installation de wp-cli
+COPY wp-cli.phar /usr/local/bin/wp
+RUN chmod +x /usr/local/bin/wp
+
+# Installation des sources wordpress
+COPY apache.conf /etc/apache2/conf.d/zapp.conf
+RUN wp core download --path=/app/public --locale=fr_FR
+#COPY .htaccess /app/public/.htaccess
+
+RUN mkdir /docker
+COPY entrypoint.sh /docker/entrypoint.sh
+RUN chmod +x /docker/entrypoint.sh
+
+RUN chown -R apache:apache /app/public
+RUN find /app/public -type d -exec chmod 755 {} +
+RUN find /app/public -type f -exec chmod 644 {} +
+
+CMD /docker/entrypoint.sh && /etc/apache2/apache2.sh
\ No newline at end of file
diff --git a/misc/wordpress/containers/wordpress/apache.conf b/misc/wordpress/containers/wordpress/apache.conf
new file mode 100644
index 0000000..b5bfe45
--- /dev/null
+++ b/misc/wordpress/containers/wordpress/apache.conf
@@ -0,0 +1,24 @@
+LoadModule rewrite_module modules/mod_rewrite.so
+ServerName nineapache.local
+DocumentRoot "/app/public"
+Alias /wordpress /app/public
+
+ Options FollowSymLinks
+ AllowOverride Limit Options FileInfo
+ DirectoryIndex index.php
+ Require all granted
+
+ RewriteEngine On
+ RewriteBase /wordpress/
+
+ RewriteRule ^index\.php$ - [L]
+
+ # add a trailing slash to /wp-admin
+ RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L]
+ RewriteCond %{REQUEST_FILENAME} -f [OR]
+ RewriteCond %{REQUEST_FILENAME} -d
+ RewriteRule ^ - [L]
+ RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
+ RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
+ RewriteRule . index.php [L]
+
\ No newline at end of file
diff --git a/misc/wordpress/containers/wordpress/entrypoint.sh b/misc/wordpress/containers/wordpress/entrypoint.sh
new file mode 100644
index 0000000..4090062
--- /dev/null
+++ b/misc/wordpress/containers/wordpress/entrypoint.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -eo pipefail
+
+cd /app/public
+
+
+wp config create \
+ --allow-root \
+ --dbhost="${WORDPRESS_DB_HOST}" \
+ --dbname="${WORDPRESS_DB_NAME}" \
+ --dbuser="${WORDPRESS_DB_USER}" \
+ --dbpass="${WORDPRESS_DB_PASSWORD}" \
+ --dbcharset="utf8mb4" \
+ --locale="fr_FR"
+
+wp core multisite-install \
+ --allow-root \
+ --url="${WORDPRESS_WEBURL}" \
+ --title="${WORDPRESS_TITLE}" \
+ --admin_user="${WORDPRESS_USER}" \
+ --admin_password="${WORDPRESS_PASSWORD}" \
+ --admin_email="${WORDPRESS_EMAIL}" \
+ --skip-email
+
+exec $@
\ No newline at end of file
diff --git a/misc/wordpress/containers/wordpress/wp-cli.phar b/misc/wordpress/containers/wordpress/wp-cli.phar
new file mode 100644
index 0000000..fabd20e
Binary files /dev/null and b/misc/wordpress/containers/wordpress/wp-cli.phar differ
diff --git a/misc/wordpress/docker-compose.yml b/misc/wordpress/docker-compose.yml
new file mode 100755
index 0000000..cab2062
--- /dev/null
+++ b/misc/wordpress/docker-compose.yml
@@ -0,0 +1,51 @@
+version: '3'
+
+services:
+ mariadb:
+ image: mariadb
+ container_name: wordpress-mariadb
+ restart: always
+ ports:
+ - "3306:3306"
+ environment:
+ MYSQL_ROOT_PASSWORD: changeme
+ MYSQL_DATABASE: wordpress
+ MYSQL_USER: user
+ MYSQL_PASSWORD: changeme
+ volumes:
+ - mariadb-data:/var/lib/mysql
+
+ wordpress:
+ build:
+ context: ./containers/wordpress
+ image: reg.cadoles.com/envole/wordpress
+ container_name: wordpress-app
+ depends_on:
+ - mariadb
+ ports:
+ - "9003:80"
+ environment:
+ - WORDPRESS_DB_HOST=mariadb
+ - WORDPRESS_DB_NAME=wordpress
+ - WORDPRESS_DB_USER=user
+ - WORDPRESS_DB_PASSWORD=changeme
+ - WORDPRESS_TITLE=wordpress
+ - WORDPRESS_USER=admin
+ - WORDPRESS_PASSWORD=changeme
+ - WORDPRESS_EMAIL=admin@noreply.fr
+ - WORDPRESS_PROTOCOL=https
+ - WORDPRESS_DOMAINE=eolebase.ac-test.fr
+ - WORDPRESS_ALIAS=/wordpress/
+
+ volumes:
+ - ./containers/volume:/docker
+
+ adminer:
+ image: docker.io/library/adminer
+ container_name: wordpress-adminer
+ restart: always
+ ports:
+ - 9100:8080
+
+volumes:
+ mariadb-data:
\ No newline at end of file
diff --git a/tmpl/envole-apache.conf b/tmpl/envole-apache.conf
index 28f1bad..1be53df 100644
--- a/tmpl/envole-apache.conf
+++ b/tmpl/envole-apache.conf
@@ -1,4 +1,3 @@
-
ProxyPass /ninegate http://0.0.0.0:9000/ninegate retry=0 keepalive=On
ProxyPassReverse /ninegate http://0.0.0.0:9000/ninegate retry=0
ProxyPass /wssninegate ws://0.0.0.0:9000/wssninegate retry=0 keepalive=On
@@ -12,6 +11,9 @@ ProxyPassReverse /nineboard http://0.0.0.0:9002/nineboard retry=0
ProxyPass /wssnineboard ws://0.0.0.0:9002/wssnineboard retry=0 keepalive=On
ProxyPassReverse /wssnineboard ws://0.0.0.0:9002/wssnineboard retry=0
+ProxyPass /wordpress http://0.0.0.0:9003/wordpress retry=0 keepalive=On
+ProxyPassReverse /wordpress http://0.0.0.0:9003/wordpress retry=0
+
ProxyPass /adminer http://0.0.0.0:9100 retry=0 keepalive=On
ProxyPassReverse /adminer http://0.0.0.0:9100 retry=0
diff --git a/tmpl/envole-nineboard.env b/tmpl/envole-nineboard.env
index 4f7ba0a..e0e872b 100644
--- a/tmpl/envole-nineboard.env
+++ b/tmpl/envole-nineboard.env
@@ -7,7 +7,7 @@ APP_ALIAS=nineboard/
%if %%getVar("activer_ninegate", "non") == "oui"
APP_MASTERIDENTITY=NINEGATE
-APP_MASTERURL=/ninegate
+APP_MASTERURL=${NINEGATE_URL}
APP_MASTERKEY=%%getVar("ninegate_secret","")
%else
%if %%getVar("activer_openldap", "non") == "oui"
diff --git a/tmpl/envole.env b/tmpl/envole.env
index 0fff9ce..363fd16 100644
--- a/tmpl/envole.env
+++ b/tmpl/envole.env
@@ -57,7 +57,8 @@ CAS_PASSWORD=%%getVar("keycload_userpassword", "")
# NINEGATE
NINEGATE_ACTIVATE=%%getBool(%%getVar("activer_ninegate", "non"))
-NINEGATE_URL=/ninegate
+NINEGATE_LOCAL=%%getBool(%%getVar("ninegate_local", "non"))
+NINEGATE_URL=%%getVar("ninegate_url", "/ninegate")
# NINEBOARD
NINEBOARD_ACTIVATE=%%getBool(%%getVar("activer_nineboard", "non"))
@@ -69,6 +70,11 @@ NEXTCLOUD_ACTIVATE=%%getBool(%%getVar("activer_nextcloud", "non"))
NEXTCLOUD_LOCAL=%%getBool(%%getVar("nextcloud_local", "non"))
NEXTCLOUD_URL=%%getVar("nextcloud_url", "/nextcloud")
+# WORDPRESS
+WORDPRESS_ACTIVATE=%%getBool(%%getVar("activer_wordpress", "non"))
+WORDPRESS_LOCAL=%%getBool(%%getVar("wordpress_local", "non"))
+WORDPRESS_URL=%%getVar("wordpress_url", "/wordpress")
+
# ADMINER
ADMINER_ACTIVATE=%%getBool(%%getVar("activer_adminer", "non"))
ADMINER_LOCAL=1