From 91f7208b91a7a4cf19444d9eb3ee8b1ff0a6a79d Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 28 Feb 2026 10:51:47 +0100 Subject: [PATCH] - Add TIKI_ROOT_LINK_LIST variable support, - .htaccess and robots.txt are now read from /var/www/tiki dir. --- Dockerfile | 12 ++++++++++++ ReleaseNotes.txt | 11 ++++++++++- compose.yaml | 1 + env.dist | 4 +++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a48d284..d4450f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ LABEL maintainer=${IMG_MAINTAINER} ARG HTTPD_VHOST_CONFIG_DIR=/etc/httpd/conf/sites.d/default_vhost.d ARG TIKI_CORE_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/70-tiki-core.conf +ARG TIKI_SHARE_DIR=/usr/share/tiki ARG TIKI_WWW_DIR=/var/www/tiki @@ -39,6 +40,17 @@ cp -f '${TIKI_CORE_CONFIG_FILE}.ref' '${TIKI_CORE \n\ sed -i -e "s%TIKI_URL%${TIKI_URL}%g" '${TIKI_CORE_CONFIG_FILE}' \n\ \n\ +IFS=":" \n\ +read -r -a file <<< "${TIKI_ROOT_LINK_LIST}" \n\ + \n\ +i=0 \n\ +while [[ ${i} -lt ${#file[@]} ]] \n\ +do \n\ + ln -s '${TIKI_WWW_DIR}'/${file[${i}]} '${TIKI_SHARE_DIR}' \n\ + \n\ + i=$(( ${i} + 1)) \n\ +done \n\ + \n\ sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf' #--------------------------------------------------------------------------------------------------- diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index b3e1617..d7c00b9 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,9 +1,18 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/Tiki V 1.0.3 - A. GIBERT - 2026/02/28 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add TIKI_ROOT_LINK_LIST variable support, +- .htaccess and robots.txt are now read from /var/www/tiki dir. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/Tiki V 1.0.2 - A. GIBERT - 2026/02/23 ------------------------------------------------------------------------------------------------------------------------------------ - Update to Tiki 2.5, -- Only ovewrite empty /var/www/tiki dir, +- Only overwrite empty /var/www/tiki dir, - Use now rx3-docker/mariadb:1.1.6-mga9 image. diff --git a/compose.yaml b/compose.yaml index d89dba5..777f96b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -73,6 +73,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 4e02b97..c63bbfb 100644 --- a/env.dist +++ b/env.dist @@ -20,7 +20,7 @@ APPL_NAME="tiki" APPL_NAME_FULL="Tiki Server" APPL_NAME_SHORT="tiki" APPL_ORG="rx3-docker" -APPL_VERSION="1.0.2" +APPL_VERSION="1.0.3" APPL_MAINTAINER='"Arnaud G. GIBERT" ' @@ -113,3 +113,5 @@ WA_WWW_INT=/var/www/${APPL_NAME} WA_TIKI_URL="/tiki/" #WA_SMTP_SERVER="mail.rx3.net" + +WA_TIKI_ROOT_LINK_LIST="ads.txt:security.txt"