From aec9b892af467471c45334404b629313660e67e4 Mon Sep 17 00:00:00 2001
From: "Arnaud G. GIBERT" <arnaud@rx3.net>
Date: Sat, 29 Nov 2025 10:10:00 +0100
Subject: [PATCH] - Now use .ref config file, - Fix short URL with non
 /mediawiki URL.

---
 Dockerfile       | 47 ++++++++++++++++++++++++++++++-----------------
 ReleaseNotes.txt |  2 +-
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 085996e..5621560 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,38 +24,51 @@ ARG MEDIAWIKI_SURL_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/65-mediawiki-short_url.
 #---------------------------------------------------------------------------------------------------
 ARG MEDIAWIKI='#!/bin/bash                                                                       \n\
                                                                                                  \n\
-chown -R apache:apache                                  /var/www/mediawiki /etc/mediawiki        \n\
-chmod -R a-x,a+X                                        /var/www/mediawiki /etc/mediawiki        \n\
-chmod    o-rwx                                          /var/www/mediawiki /etc/mediawiki        \n\
-chmod -R u+rwX                                          /var/www/mediawiki                       \n\
+chown -R apache:apache                                         /var/www/mediawiki /etc/mediawiki \n\
+chmod -R a-x,a+X                                               /var/www/mediawiki /etc/mediawiki \n\
+chmod    o-rwx                                                 /var/www/mediawiki /etc/mediawiki \n\
+chmod -R u+rwX                                                 /var/www/mediawiki                \n\
+                                                                                                 \n\
+cp -f '${MEDIAWIKI_CORE_CONFIG_FILE}.ref'                      '${MEDIAWIKI_CORE_CONFIG_FILE}'   \n\
+cp -f '${MEDIAWIKI_SURL_CONFIG_FILE}.ref'                      '${MEDIAWIKI_SURL_CONFIG_FILE}'   \n\
                                                                                                  \n\
 if [[ "${MEDIAWIKI_CONFIG}" == "TRUE" ]]                                                         \n\
 then                                                                                             \n\
-    sed -i "s/Require local/Require all granted/"       '${MEDIAWIKI_CORE_CONF_FILE}'            \n\
+    sed -i "s/MEDIAWIKI_CONFIG_AUTH/all granted/"              '${MEDIAWIKI_CORE_CONFIG_FILE}'   \n\
+else                                                                                             \n\
+    sed -i "s/MEDIAWIKI_CONFIG_AUTH/local/"                    '${MEDIAWIKI_CORE_CONFIG_FILE}'   \n\
 fi                                                                                               \n\
                                                                                                  \n\
-sed -i -e "s%Alias /mediawiki%Alias ${MEDIAWIKI_URL}%" '${MEDIAWIKI_CORE_CONFIG_FILE}'           \n\
-sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%"          '${MEDIAWIKI_SURL_CONFIG_FILE}'           \n\
+sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%g"                 '${MEDIAWIKI_CORE_CONFIG_FILE}'   \n\
+sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%g"                 '${MEDIAWIKI_SURL_CONFIG_FILE}'   \n\
                                                                                                  \n\
-sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%"      /etc/ssmtp/ssmtp.conf'
+sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%"             /etc/ssmtp/ssmtp.conf'
 #---------------------------------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------------------------------
 ARG MEDIAWIKI_SURL_CONFIG='# mediawiki short url configuration                                   \n\
                                                                                                  \n\
-RewriteCond /usr/share%{REQUEST_URI} !-f                                                         \n\
-RewriteCond /usr/share%{REQUEST_URI} !-d                                                         \n\
+# Eval the subquery                                                                              \n\
+RewriteCond %{REQUEST_URI} ^MEDIAWIKI_URL(.*)$                                                   \n\
+RewriteRule ^ -            [E=SUBREQUEST_URI:%1]                                                 \n\
                                                                                                  \n\
-RewriteRule "^/?MEDIAWIKI_URL(/.*)?$" "/usr/share/mediawiki/index.php" [L,QSA]                   \n\
+# Skip local file or dir                                                                         \n\
+RewriteCond /usr/share/mediawiki%{ENV:SUBREQUEST_URI} !-f                                        \n\
+RewriteCond /usr/share/mediawiki%{ENV:SUBREQUEST_URI} !-d                                        \n\
+                                                                                                 \n\
+# Rewite                                                                                         \n\
+RewriteRule "^/?MEDIAWIKI_URL(/.*)?$" "/usr/share/mediawiki/index.php" [L,                       \n\
 '
 #---------------------------------------------------------------------------------------------------
 
 
 
-RUN    urpmi.update -a                                                                                                                                     \
-    && urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd php-xmlreader git mediawiki mediawiki-pgsql                                 \
-    && mv         /etc/httpd/conf/sites.d/mediawiki.conf                                                                     ${MEDIAWIKI_CORE_CONFIG_FILE} \
-    && echo  -e   "${MEDIAWIKI_SURL_CONFIG}" | sed -e "s/\`/'/g" -e 's/ *$//'                                              > ${MEDIAWIKI_SURL_CONFIG_FILE} \
-    && echo  -e   "${MEDIAWIKI}" | sed -e "s/\`/'/g" -e 's/ *$//'                                                          > /etc/init.d/mediawiki         \
-    && chmod  a+x /etc/init.d/mediawiki                                                                                                                    \
+RUN    urpmi.update -a                                                                                                                                         \
+    && urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd php-xmlreader git mediawiki mediawiki-pgsql                                     \
+    && mv         /etc/httpd/conf/sites.d/mediawiki.conf                                                                     ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
+    && sed -i -e  "s%Alias /mediawiki%Alias MEDIAWIKI_URL%" -e "s/Require local/Require MEDIAWIKI_CONFIG_AUTH/"              ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
+    && echo  -e   "${MEDIAWIKI_SURL_CONFIG}" | sed -e "s/\`/'/g" -e 's/ *$//'                                              > ${MEDIAWIKI_SURL_CONFIG_FILE}.ref \
+    && echo  -e   "${MEDIAWIKI}" | sed -e "s/\`/'/g" -e 's/ *$//'                                                          > /etc/init.d/mediawiki             \
+    && chmod  a+x /etc/init.d/mediawiki                                                                                                                        \
     && ln    -s   /etc/init.d/mediawiki /etc/rcD.d/S40mediawiki
+
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 4f683a7..c1fc8b2 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Rx3-Docker/MediaWiki V 1.1.0 - A. GIBERT - 2025/11/28
+Rx3-Docker/MediaWiki V 1.1.0 - A. GIBERT - 2025/11/29
 ------------------------------------------------------------------------------------------------------------------------------------
 
 - Add short URL support,