diff --git a/Dockerfile b/Dockerfile index effd1b4..0b58b73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,27 +15,34 @@ LABEL org.rx3.${IMG_NAME}.version=${IMG_VERSION} LABEL org.rx3.${IMG_NAME}.maintainer=${IMG_MAINTAINER} LABEL maintainer=${IMG_MAINTAINER}ARG MEDIAWIKI_VERSION=1.43.5 +ARG AUTH_REMOTEUSER_URL="https://extdist.wmflabs.org/dist/extensions/Auth_remoteuser-REL1_43-2c7c5be.tar.gz" -#---------------------------------------------------------------------------------------------------- -ARG MEDIAWIKI='#!/bin/bash \n\ - \n\ -chown -R apache:apache ${APACHE_DOC_ROOT} \n\ -chmod -R a-x,a+X ${APACHE_DOC_ROOT} \n\ -chmod o-rwx ${APACHE_DOC_ROOT} \n\ -chmod -R o+rwX ${APACHE_DOC_ROOT}/mediawiki/config \n\ - \n\ - \n\ -sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf' -#---------------------------------------------------------------------------------------------------- + +#--------------------------------------------------------------------------------------------------- +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\ + \n\ +if [[ "${WIKIMEDIA_CONFIG}" == "TRUE" ]] \n\ +then \n\ + sed -i "s/Require local/Require all granted/" /etc/httpd/conf/webapps.d/mediawiki.conf \n\ +fi \n\ + \n\ +sed -i -e "s%Alias /mediawiki%Alias ${WIKIMEDIA_PATH}%" /etc/httpd/conf/webapps.d/mediawiki.conf \n\ + \n\ +sed -i -e "s%mailhub=mail%mailhub=${SMTP_SERVER}%" /etc/ssmtp/ssmtp.conf' +#--------------------------------------------------------------------------------------------------- RUN urpmi.update -a \ && urpmi --force wget ssmtp php-iconv php-fileinfo php-dom php-apcu php-gd git mediawiki mediawiki-pgsql \ - && sed -i "s/Require local/Require all granted/" /etc/httpd/conf/webapps.d/mediawiki.conf \ - && chown -R root:root /var/www \ - && chmod -R 775 /var/www \ + && wget -q -O - ${AUTH_REMOTEUSER_URL} | tar -xzvf - -C /usr/share/mediawiki/extensions \ + && chown -R root:root /usr/share/mediawiki/extensions \ && 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/ReadMe.txt b/ReadMe.txt index 46febda..7d97f92 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -6,7 +6,8 @@ This project aims to build a MediaWiki docker image. Features: - Curtently based on rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/postgresql:1.1.4-mga9 images, - - Sync with MediaWiki 1.43.5. + - Sync with MediaWiki 1.43.5, + - Auth_remoteuser extension included. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 3101e21..2f768c0 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,7 +1,8 @@ ------------------------------------------------------------------------------------------------------------------------------------ -Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/22 +Rx3-Docker/MediaWiki V 1.0.0 - A. GIBERT - 2025/11/23 ------------------------------------------------------------------------------------------------------------------------------------ - Initial release, - Based on rx3-docker/php-apache:1.5.4-mga9 & rx3-docker/postgresql:1.1.4-mga9 images, -- Use mediawiki 1.43.5 from Rx3 rpm. +- Use mediawiki 1.43.5 from Rx3 rpm, +- Include Auth_remoteuser extension. diff --git a/compose.yaml b/compose.yaml index 3eee1d6..1dd4d59 100644 --- a/compose.yaml +++ b/compose.yaml @@ -70,6 +70,8 @@ services: APACHE_GID: ${WA_GROUP_ID} APACHE_DOC_ROOT: ${WA_APACHE_DOC_ROOT} PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT} + WIKIMEDIA_CONFIG: ${WA_WIKIMEDIA_CONFIG} + WIKIMEDIA_PATH: ${WA_WIKIMEDIA_PATH} volumes: - ./${WA_LOG_INIT_EXT}:${WA_LOG_INIT_INT} diff --git a/env.dist b/env.dist index c2d8866..a986076 100644 --- a/env.dist +++ b/env.dist @@ -116,4 +116,6 @@ WA_TRASH_INT=/var/www/${APPL_NAME}/trash #docker_config_add ${WA_CONF_EXT}/config_inc.php ${WA_CONF_EXT}/config_inc.php.ref +WA_WIKIMEDIA_CONFIG="TRUE" +WA_WIKIMEDIA_PATH="/mediawiki" #WA_SMTP_SERVER="mail.rx3.net"