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

- Use now rx3-docker/tiki:1.0.4-mga9, rx3-docker/php-apache:1.6.3-mga9 & rx3-docker/tools:1.3.1-mga9 images,

Browse Source 
- Use new Proxy_Ext macro.
This commit is contained in:
Arnaud G. GIBERT
2026-03-01 20:30:20 +01:00
parent 0f27028043
commit edb0fe978c
3 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReleaseNotes.txt
View File

@@ -1,8 +1,17 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3/ETC V 1.0.2 - A. GIBERT - 2026/03/01
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/tiki:1.0.4-mga9, rx3-docker/php-apache:1.6.3-mga9 & rx3-docker/tools:1.3.1-mga9 images,
- Use new Proxy_Ext macro.
------------------------------------------------------------------------------------------------------------------------------------
Rx3/ETC V 1.0.1 - A. GIBERT - 2026/02/28
------------------------------------------------------------------------------------------------------------------------------------
- Use now rx3-docker/tiki:1.0.3-mga9,
- Use now rx3-docker/tiki:1.0.3-mga9 image,
- Use TIKI_ROOT_LINK_LIST and add by default ads.txt & security.txt root links,
- Fix phpMyAdmin redirection on login/logout.

21
env.dist
View File

@@ -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.1"
APPL_VERSION="1.0.2"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
@@ -43,7 +43,13 @@ if [[ "${APPL_ENV}" != "prd" ]]
then
APPL_SUFFIX="-${APPL_ENV}"
PORT_ENV_OFFSET=100
DOCKER_TOOLS_USER_GROUP_FORCE=TRUE
if [[ "${APPL_ENV}" == "tst" ]]
then
DOCKER_TOOLS_USER_GROUP_FORCE=FALSE
else
DOCKER_TOOLS_USER_GROUP_FORCE=TRUE
fi
else
APPL_SUFFIX=""
PORT_ENV_OFFSET=0
@@ -53,11 +59,12 @@ fi
if [[ "${APPL_ENV}" != "dvp" ]]
then
APPL_USER="apache"
APPL_GROUP="entrashi"
else
APPL_USER="davfs2"
APPL_GROUP="apache"
fi
APPL_GROUP="apache"
ORG_URL_PREFIX="${ORG_REGISTRY}/${ORG_NAME}"
APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_NAME_PREFIX}/${APPL_NAME_SHORT}"
@@ -84,12 +91,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.1-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.2-mga9 ${ORG_URL_PREFIX} php-apache 1.6.3-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 TOOLS tools ${ORG_URL_PREFIX} tools - 1.3.1-mga9 - - - httpd - - 80 - 8080 ${APPL_USER} ${APPL_GROUP}
docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.0.3-mga9 - - - - - - 80 - - apache apache
docker_service_add WA webapp ${ORG_URL_PREFIX} tiki - 1.0.4-mga9 - - - - - - 80 - - apache ${APPL_GROUP}
@@ -116,7 +123,7 @@ DB_DB_NAME="tiki"
DB_DB_USER="tiki"
DB_DB_PASSWORD="tikiadmin"
DB_SERVER_NAME="Tiki"
DB_SERVER_NAME="ETC Tiki"

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

@@ -1,36 +1,17 @@
# Reverse Proxy Configuration
ProxyRequests Off
ProxyPreserveHost On
AllowEncodedSlashes NoDecode
#-------------------------------------------------------------------------------------------------------------------
# ETC Private
#-------------------------------------------------------------------------------------------------------------------
Use SupervisorProxy private/web-server-sv ${WS_HOST_NAME} ${WS_PORT_SV_INT}
Use SupervisorProxy private/database-sv ${DB_HOST_NAME} ${DB_PORT_SV_INT}
Use SupervisorProxy private/tools-sv ${TOOLS_HOST_NAME} ${TOOLS_PORT_SV_INT}
Use SupervisorProxy private/webapp-sv ${WA_HOST_NAME} ${WA_PORT_SV_INT}
# Supervisors
Use Proxy_Ext private/web-server-sv ${WS_HOST_NAME} ${WS_PORT_SV_INT}
Use Proxy_Ext private/database-sv ${DB_HOST_NAME} ${DB_PORT_SV_INT}
Use Proxy_Ext private/tools-sv ${TOOLS_HOST_NAME} ${TOOLS_PORT_SV_INT}
Use Proxy_Ext private/webapp-sv ${WA_HOST_NAME} ${WA_PORT_SV_INT}
# Tools
Use Proxy_Ext private/tools ${TOOLS_HOST_NAME} ${TOOLS_PORT_MAIN_INT}
RewriteRule "^/private/tools$" "/private/tools/" [R]
<Location /private/tools/>
ProxyPass http://${TOOLS_HOST_NAME}:${TOOLS_PORT_MAIN_INT}/ flushpackets=on
ProxyPassReverse http://${TOOLS_HOST_NAME}:${TOOLS_PORT_MAIN_INT}/
ProxyPassReverseCookiePath / /private/tools/
RequestHeader setifempty X-Forwarded-Proto expr=%{REQUEST_SCHEME}
Header edit* Location /(?!private/tools/)(.*)$ /private/tools/$1
</Location>
#-------------------------------------------------------------------------------------------------------------------
# ETC WebApp