Rx3-Docker/mediawiki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

- Now use .ref config file,

Browse Source 
- Fix short URL with non /mediawiki URL.
This commit is contained in:
Arnaud G. GIBERT 2025-11-29 10:10:00 +01:00
parent 10e422c206
commit aec9b892af
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Dockerfile
View File

@ -24,38 +24,51 @@ ARG MEDIAWIKI_SURL_CONFIG_FILE=${HTTPD_VHOST_CONFIG_DIR}/65-mediawiki-short_url.
#--------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------
ARG MEDIAWIKI='#!/bin/bash \n\ ARG MEDIAWIKI='#!/bin/bash \n\
\n\ \n\
chown -R apache:apache /var/www/mediawiki /etc/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 -R a-x,a+X /var/www/mediawiki /etc/mediawiki \n\
chmod o-rwx /var/www/mediawiki /etc/mediawiki \n\ chmod o-rwx /var/www/mediawiki /etc/mediawiki \n\
chmod -R u+rwX /var/www/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\ \n\
if [[ "${MEDIAWIKI_CONFIG}" == "TRUE" ]] \n\ if [[ "${MEDIAWIKI_CONFIG}" == "TRUE" ]] \n\
then \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\ fi \n\
\n\ \n\
sed -i -e "s%Alias /mediawiki%Alias ${MEDIAWIKI_URL}%" '${MEDIAWIKI_CORE_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}%" '${MEDIAWIKI_SURL_CONFIG_FILE}' \n\ sed -i -e "s%MEDIAWIKI_URL%${MEDIAWIKI_URL}%g" '${MEDIAWIKI_SURL_CONFIG_FILE}' \n\
\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\ ARG MEDIAWIKI_SURL_CONFIG='# mediawiki short url configuration \n\
\n\ \n\
RewriteCond /usr/share%{REQUEST_URI} !-f \n\ # Eval the subquery \n\
RewriteCond /usr/share%{REQUEST_URI} !-d \n\ RewriteCond %{REQUEST_URI} ^MEDIAWIKI_URL(.*)$ \n\
RewriteRule ^ - [E=SUBREQUEST_URI:%1] \n\
\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 \ RUN urpmi.update -a \
&& urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd php-xmlreader git mediawiki mediawiki-pgsql \ && 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} \ && mv /etc/httpd/conf/sites.d/mediawiki.conf ${MEDIAWIKI_CORE_CONFIG_FILE}.ref \
&& echo -e "${MEDIAWIKI_SURL_CONFIG}" | sed -e "s/\`/'/g" -e 's/ *$//' > ${MEDIAWIKI_SURL_CONFIG_FILE} \ && 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}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/mediawiki \ && echo -e "${MEDIAWIKI_SURL_CONFIG}" | sed -e "s/\`/'/g" -e 's/ *$//' > ${MEDIAWIKI_SURL_CONFIG_FILE}.ref \
&& chmod a+x /etc/init.d/mediawiki \ && 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 && ln -s /etc/init.d/mediawiki /etc/rcD.d/S40mediawiki

2
ReleaseNotes.txt
View File

@ -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, - Add short URL support,