Rx3/etc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: Rx3:etc-1.0.0
Branches Tags
Rx3:master
Rx3:etc-1.0.2 Rx3:etc-1.0.1 Rx3:etc-1.0.0
..
compare: Rx3:etc-1.0.1
Branches Tags
Rx3:master
Rx3:etc-1.0.2 Rx3:etc-1.0.1 Rx3:etc-1.0.0

1 Commits
etc-1.0.0 ... etc-1.0.1

Author SHA1 Message Date
Arnaud G. GIBERT
0f27028043 - 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.
 2026-02-28 19:41:02 +01:00
4 changed files with 18 additions and 3 deletions
Expand all files Collapse all files

10
ReleaseNotes.txt
View File

@@ -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 Rx3/ETC V 1.0.0 - A. GIBERT - 2026/02/27
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

1
compose.yaml
View File

@@ -157,6 +157,7 @@ services:
APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT} APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT}
PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT} PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT}
TIKI_URL: ${WA_TIKI_URL} TIKI_URL: ${WA_TIKI_URL}
TIKI_ROOT_LINK_LIST: ${WA_TIKI_ROOT_LINK_LIST}
volumes: volumes:
- ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT}

8
env.dist
View File

@@ -19,7 +19,7 @@ APPL_NAME="etc"
APPL_NAME_PREFIX="rx3" APPL_NAME_PREFIX="rx3"
APPL_NAME_FULL="ETC Docker Image" APPL_NAME_FULL="ETC Docker Image"
APPL_NAME_SHORT="etc" APPL_NAME_SHORT="etc"
APPL_VERSION="1.0.0" APPL_VERSION="1.0.1"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>' APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
@@ -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 | # | 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 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 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 #docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref
WA_TIKI_URL="/" WA_TIKI_URL="/"
WA_TIKI_ROOT_LINK_LIST="ads.txt:security.txt"
#WA_SMTP_SERVER="mail.rx3.net" #WA_SMTP_SERVER="mail.rx3.net"

2
src/web-server/conf.d/60-etc.conf.ref
View File

@@ -26,6 +26,8 @@
ProxyPassReverseCookiePath / /private/tools/ ProxyPassReverseCookiePath / /private/tools/
RequestHeader setifempty X-Forwarded-Proto expr=%{REQUEST_SCHEME} RequestHeader setifempty X-Forwarded-Proto expr=%{REQUEST_SCHEME}
Header edit* Location /(?!private/tools/)(.*)$ /private/tools/$1
</Location> </Location>