diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index bff6fda..bb63436 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,13 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3/ETC V 1.0.1 - A. GIBERT - 2026/02/28 +------------------------------------------------------------------------------------------------------------------------------------ + +- Use now rx3-docker/tiki:1.0.3-mga9, +- Use TIKI_ROOT_LINK_LIST and add by default ads.txt & security.txt root links, +- Fix phpMyAdmin redirection on login/logout. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3/ETC V 1.0.0 - A. GIBERT - 2026/02/27 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index e8418a9..4eba628 100644 --- a/compose.yaml +++ b/compose.yaml @@ -157,6 +157,7 @@ services: APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT} PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT} TIKI_URL: ${WA_TIKI_URL} + TIKI_ROOT_LINK_LIST: ${WA_TIKI_ROOT_LINK_LIST} volumes: - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} diff --git a/env.dist b/env.dist index 82b001b..f9c9280 100644 --- a/env.dist +++ b/env.dist @@ -19,7 +19,7 @@ APPL_NAME="etc" APPL_NAME_PREFIX="rx3" APPL_NAME_FULL="ETC Docker Image" APPL_NAME_SHORT="etc" -APPL_VERSION="1.0.0" +APPL_VERSION="1.0.1" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -84,12 +84,12 @@ DOCKER_TOOLS_VOLUME=SPLITED # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add WS web-server ${APPL_URL_PREFIX} - "ETC Web Server" 1.0.0-mga9 ${ORG_URL_PREFIX} php-apache 1.6.2-mga9 - - 8068 80 - - ${APPL_USER} ${APPL_GROUP} +docker_service_add WS web-server ${APPL_URL_PREFIX} - "ETC Web Server" 1.0.1-mga9 ${ORG_URL_PREFIX} php-apache 1.6.2-mga9 - - 8068 80 - - ${APPL_USER} ${APPL_GROUP} docker_service_add DB database ${ORG_URL_PREFIX} mariadb - 1.1.6-mga9 - - - mysql - - 3306 - - mysql mysql docker_service_add TOOLS tools ${ORG_URL_PREFIX} tools - 1.3.0-mga9 - - - httpd - - 80 - 8080 ${APPL_USER} ${APPL_GROUP} -docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.0.2-mga9 - - - - - - 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.0.3-mga9 - - - - - - 80 - - apache apache @@ -146,4 +146,6 @@ WA_WWW_EXT="./mnt/webapp${WA_WWW_INT}" #docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref WA_TIKI_URL="/" +WA_TIKI_ROOT_LINK_LIST="ads.txt:security.txt" + #WA_SMTP_SERVER="mail.rx3.net" diff --git a/src/web-server/conf.d/60-etc.conf.ref b/src/web-server/conf.d/60-etc.conf.ref index 535356a..8d07b0d 100644 --- a/src/web-server/conf.d/60-etc.conf.ref +++ b/src/web-server/conf.d/60-etc.conf.ref @@ -26,6 +26,8 @@ ProxyPassReverseCookiePath / /private/tools/ RequestHeader setifempty X-Forwarded-Proto expr=%{REQUEST_SCHEME} + + Header edit* Location /(?!private/tools/)(.*)$ /private/tools/$1