Add MEDIAWIKI_PROXY_SERVERS setting

Reviewed-on: #34

.env.sample

@@ -1,6 +1,7 @@
 TYPE=mediawiki
 
 DOMAIN=mediawiki.example.com
+COMPOSE_FILE="compose.yml"
 
 #EXTRA_DOMAINS=', `www.wiki.example.com`'
 LETS_ENCRYPT_ENV=production
@@ -11,21 +12,35 @@ MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com"
 MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
 MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
 
+# list of language options (without ".json"):
+# https://gerrit.wikimedia.org/g/mediawiki/core/%2B/HEAD/languages/i18n
+MEDIAWIKI_LANGUAGE="en"
+
 MEDIAWIKI_IS_PRIVATE=1
+MEDIAWIKI_ALLOW_REGISTRATION=0
 
 MEDIAWIKI_DEBUG=0
 
-## SMTP
-#SMTP_HOST=postfix_relay_app
-#SMTP_HOST=mailu_front
-
 SECRET_DB_ROOT_PASSWORD_VERSION=v1
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_MEDIAWIKI_SECRET_KEY_VERSION=v1 # length=64
 
+# SMTP
+
+## via local postfix/mailu
+#SMTP_HOST=postfix_relay_app
+#SMTP_HOST=mailu_front
+
+## via remote email provider
+#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
+#SMTP_HOST="mail.example.com"
+#SMTP_PORT=587
+#SMTP_USER="${MEDIAWIKI_EMAIL_FROM}"
+#SECRET_SMTP_PASSWORD_VERSION=v1
+
 # SAML
 
-#COMPOSE_FILE="compose.yml:compose.simplesaml.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.simplesaml.yml"
 
 #SAML_ENABLED=1
 #SAML_CONTACT_NAME="Sam Ell"
@@ -41,7 +56,32 @@ SECRET_MEDIAWIKI_SECRET_KEY_VERSION=v1 # length=64
 
 ## OpenID Connect
 # OPENID_ENABLED=1
-# COMPOSE_FILE="compose.yml:compose.openid.yml"
-# OPENID_KEYCLOAK_URL="https://keycloak.local:8080/auth/realms/acme/"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.openid.yml"
+# OPENID_KEYCLOAK_URL="https://keycloak.local:8080/realms/acme/"
 # OPENID_CLIENT_ID="mediawiki"
 # SECRET_OPENID_CLIENT_SECRET_VERSION=v1
+
+## WikiMarkdown
+#MARKDOWN_ENABLED=1
+
+## MobileFrontend
+#MOBILEFRONTEND_ENABLED=1
+
+## MsUpload
+#MSU_ENABLED=1
+
+## PageForms
+#PAGEFORMS_ENABLED=1
+
+## PageSchemas
+#PAGESCHEMAS_ENABLED=1
+
+## SemanticMediaWiki
+#SEMANTICMW_ENABLED=1
+
+## WikiMarkdown
+#MARKDOWN_ENABLED=1
+
+## Tweeki skin
+#TWEEKI_ENABLED=0
+

LocalSettings.php.tmpl

@@ -5,7 +5,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
-
 ## Uncomment this to disable output compression
 # $wgDisableOutputCompression = true;
 
@@ -85,7 +84,7 @@ $wgShellLocale = "C.UTF-8";
 #$wgCacheDirectory = "$IP/cache";
 
 # Site language code, should be one of the list in ./languages/data/Names.php
-$wgLanguageCode = "en";
+$wgLanguageCode = "{{ env "MEDIAWIKI_LANGUAGE" }}";
 
 $wgSecretKey = rtrim(file_get_contents('/run/secrets/mediawiki_secret_key'));
 
@@ -107,8 +106,13 @@ $wgRightsIcon = "";
 # Path to the GNU diff3 utility. Used for conflict resolution.
 $wgDiff3 = "/usr/bin/diff3";
 
-# The following permissions were set based on your choice in the installer
+{{ if eq (env "MEDIAWIKI_ALLOW_REGISTRATION") "1" }}
+$wgGroupPermissions['*']['createaccount'] = true;
+$wgEmailConfirmToEdit = true;
+{{ else }}
 $wgGroupPermissions['*']['createaccount'] = false;
+{{ end }}
+
 $wgGroupPermissions['*']['edit'] = false;
 {{ if eq (env "MEDIAWIKI_IS_PRIVATE") "1" }}
 $wgGroupPermissions['*']['read'] = false;
@@ -116,15 +120,34 @@ $wgGroupPermissions['*']['read'] = false;
 $wgGroupPermissions['*']['read'] = true;
 {{ end }}
 
-## Default skin: you can change the default skin. Use the internal symbolic
-## names, ie 'vector', 'monobook':
-$wgDefaultSkin = "vector";
+{{ if ne (env "MEDIAWIKI_PROXY_SERVERS") "" }}
+// In LocalSettings.php
+$wgUseCdn = true;
+$wgCdnServersNoPurge = [];
+$wgCdnServersNoPurge[] = "{{ env "MEDIAWIKI_PROXY_SERVERS" }}";
+{{ end }}
 
 # Enabled skins.
 # The following skins were automatically enabled:
 wfLoadSkin( 'MonoBook' );
 wfLoadSkin( 'Timeless' );
 wfLoadSkin( 'Vector' );
+wfLoadSkin( 'MinervaNeue' );
+
+## Default skin: you can change the default skin. Use the internal symbolic
+## names, ie 'vector', 'monobook':
+
+{{ if eq (env "TWEEKI_ENABLED") "1" }}
+wfLoadSkin( 'Tweeki' );
+$wgDefaultSkin = "tweeki";
+{{ else }}
+$wgDefaultSkin = "vector";
+{{ end }}
+
+{{ if eq (env "MOBILEFRONTEND_ENABLED") "1" }}
+wfLoadExtension( 'MobileFrontend' );
+$wgDefaultMobileSkin = 'minerva';
+{{ end }}
 
 # Enabled extensions. Most of the extensions are enabled by adding
 # wfLoadExtensions('ExtensionName');
@@ -143,23 +166,6 @@ $wgDefaultUserOptions['visualeditor-enable'] = 1;
 
 $wgVisualEditorAllowLossySwitching = false;
 
-$wgVirtualRestConfig['modules']['parsoid'] = [
-	// URL to the Parsoid instance - use port 8142 if you use the Debian package - the parameter 'URL' was first used but is now deprecated (string)
-	'url' => 'http://parsoid:8000/',
-	// Parsoid "domain" (string, optional) - MediaWiki >= 1.26
-	'domain' => 'localhost',
-	// Parsoid "prefix" (string, optional) - deprecated since MediaWiki 1.26, use 'domain'
-	'prefix' => 'localhost',
-	// Forward cookies in the case of private wikis (string or false, optional)
-	'forwardCookies' => true,
-	// request timeout in seconds (integer or null, optional)
-	'timeout' => null,
-	// Parsoid HTTP proxy (string or null, optional)
-	'HTTPProxy' => null,
-	// whether to parse URL as if they were meant for RESTBase (boolean or null, optional)
-	'restbaseCompat' => null,
-];
-
 {{ if eq (env "SAML_ENABLED") "1" }}
 wfLoadExtension( 'PluggableAuth' );
 
@@ -206,14 +212,42 @@ $wgGroupPermissions['*']['createaccount'] = false;
 
 {{ if env "SMTP_HOST" }}
 $wgSMTP = [
-    'host'     => '{{ env "SMTP_HOST" }}', // could also be an IP address. Where the SMTP server is located
-    'port'     => 25,                 // Port to use when connecting to the SMTP server
-    'auth'     => false,               // Should we use SMTP authentication (true or false)
-    #'username' => 'my_user_name',     // Username to use for SMTP authentication (if being used)
-    #'password' => 'my_password'       // Password to use for SMTP authentication (if being used)
+    'host'     => '{{ env "SMTP_HOST" }}',       // could also be an IP address. Where the SMTP server is located
+    'port'     => {{ env "SMTP_PORT" }},         // Port to use when connecting to the SMTP server
+{{ if env "SMTP_USER" }}
+    'auth'     => true,                          // Should we use SMTP authentication (true or false)
+    'username' => '{{ env "SMTP_USER" }}',       // Username to use for SMTP authentication (if being used)
+    'password' => '{{ secret "smtp_password" }}' // Password to use for SMTP authentication (if being used)
+{{ else }}
+    'auth'     => false
+{{ end }}
 ];
 {{ end }}
 
+{{ if eq (env "MSU_ENABLED") "1" }}
+wfLoadExtension( 'MsUpload' );
+$wgAllowJavaUploads = true; // Solves problem with Office 2007 and newer files (docx, xlsx, etc.)
+{{ end }}
+
+{{ if eq (env "PAGEFORMS_ENABLED") "1" }}
+wfLoadExtension( 'PageForms' );
+{{ end }}
+
+{{ if eq (env "PAGESCHEMAS_ENABLED") "1" }}
+wfLoadExtension( 'PageSchemas' );
+{{ end }}
+
+{{ if eq (env "SEMANTICMW_ENABLED") "1" }}
+wfLoadExtension( 'SemanticMediaWiki' );
+enableSemantics( '{{ env "DOMAIN" }}' );
+{{ end }}
+
+{{ if eq (env "MARKDOWN_ENABLED") "1" }}
+wfLoadExtension( 'WikiMarkdown' );
+$wgAllowMarkdownExtra = true; // allows usage of Parsedown Extra
+$wgAllowMarkdownExtended = true; // allows usage of Parsedown Extended
+{{ end }}
+
 $wgFileExtensions = array(
     'png', 'gif', 'jpg', 'jpeg', 'doc', 'xls', 'mpp', 'pdf', 'ppt', 'tiff',
     'bmp', 'docx', 'xlsx', 'pptx', 'ps', 'odt', 'ods', 'odp', 'odg'

README.md

@@ -1,8 +1,6 @@
 # Mediawiki
 
-[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/mediawiki/status.svg)](https://drone.autonomic.zone/coop-cloud/mediawiki)
-
-Mediawiki [version 1.35][mediawiki-1.35]
+[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/mediawiki/status.svg)](https://build.coopcloud.tech/coop-cloud/mediawiki)
 
 <!-- metadata -->
 * **Category**: Apps
@@ -29,6 +27,8 @@ Mediawiki [version 1.35][mediawiki-1.35]
 
 ## Email
 
+### Coop Cloud mailu or postfix
+
 1. `abra app config YOURAPPDOMAIN` - edit `.envrc` and uncomment the `SMTP` lines. Set `SMTP_HOST` to
    `postfix_relay` for `coop-cloud/postfix_relay`, or `mailu_front` for
    `coop-cloud/mailu` (assuming default stack names)
@@ -36,6 +36,14 @@ Mediawiki [version 1.35][mediawiki-1.35]
    `postfix_relay`. This doesn't seem to be required for Mailu.
 3. `abra app deploy YOURAPPDOMAIN`
 
+### Remote provider
+
+1. `abra app config YOURAPPDOMAIN` - uncomment `SMTP` under the "remote email provider" section and set values for `SMTP_HOST`, `SMTP_PORT` and `SMTP_USER`
+2. `abra app secret insert YOURAPPDOMAIN smtp_password v1 YOURSMTPPASSWORD`
+3. `abra app deploy YOURAPPDOMAIN`
+
+Note: Only STARTTLS is supported, TLS won't work.
+
 ## Single Sign On
 
 ### SimpleSAMLphp

abra.sh

@@ -1,8 +1,8 @@
-export LOCAL_SETTINGS_CONF_VERSION=v6
+export LOCAL_SETTINGS_CONF_VERSION=v23
 export HTACCESS_CONF_VERSION=v1
-export ENTRYPOINT_CONF_VERSION=v3
-export COMPOSER_LOCAL_CONF_VERSION=v1
-export PHP_INI_VERSION=v1
+export ENTRYPOINT_CONF_VERSION=v20
+export COMPOSER_LOCAL_CONF_VERSION=v5
+export PHP_INI_VERSION=v4
 
 export SAML_ENTRYPOINT_CONF_VERSION=v3
 

compose.smtp.yml

@@ -0,0 +1,14 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - SMTP_USER
+    secrets:
+      - smtp_password
+
+secrets:
+  smtp_password:
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
+    external: true

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: mediawiki:1.39.1
+    image: mediawiki:1.39.3
     environment:
       - DOMAIN
       - STACK_NAME
@@ -14,12 +14,14 @@ services:
       - MEDIAWIKI_LOGO_FILE
       - MEDIAWIKI_IS_PRIVATE
       - MEDIAWIKI_DEBUG
+      - MEDIAWIKI_LANGUAGE=${MEDIAWIKI_LANGUAGE:-en}
       - SAML_ENABLED
       - OPENID_ENABLED
       - DB_HOST=db
       - DB_USER=mediawiki
       - DB_NAME=mediawiki
       - SMTP_HOST
+      - SMTP_PORT=${SMTP_PORT:-25}
     volumes:
       - "mediawiki_images:/var/www/html/images"
     configs:
@@ -45,7 +47,9 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-        - "coop-cloud.${STACK_NAME}.version=2.2.2+1.39.1"
+        - "coop-cloud.${STACK_NAME}.version=2.5.0+1.39.3"
+        - "backupbot.backup=true"
+        - "backupbot.backup.path=/var/www/html/images"
     entrypoint: /docker-entrypoint2.sh
 
   db:
@@ -62,14 +66,14 @@ services:
       - db_password
     networks:
       - internal
-
-  parsoid:
-    image: thenets/parsoid:0.11.0
-    hostname: parsoidserver
-    networks:
-      - internal
-    environment:
-      PARSOID_DOMAIN_localhost: http://app:80/api.php
+    deploy:
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.path: "/tmp/dump.sql.gz"
+        backupbot.backup.pre-hook: "sh -c 'mysqldump --single-transaction -u root -p\"$$(cat /run/secrets/db_root_password)\" mediawiki | gzip > /tmp/dump.sql.gz'"
+        backupbot.backup.post-hook: "rm -f /tmp/dump.sql.gz"
+        backupbot.restore: "true"
+        backupbot.restore.post-hook: "sh -c 'mysql -u root -p\"$$(cat /run/secrets/db_root_password)\" mediawiki < /tmp/dbdump.sql && rm -f /tmp/dbdump.sql'"
 
 volumes:
   mariadb:

composer.local.json.tmpl

@@ -1,4 +1,9 @@
 {
+{{ if eq (env "SEMANTICMW_ENABLED") "1" }}
+  "require": {
+    "mediawiki/semantic-media-wiki": "^4.1.0"
+  },
+{{ end }}
   "extra": {
     "merge-plugin": {
       "include": [

entrypoint.sh.tmpl

@@ -40,16 +40,13 @@ init_db() {
 		php /var/www/html/maintenance/sql.php /var/www/html/maintenance/tables.sql
 		php /var/www/html/maintenance/sql.php /var/www/html/maintenance/interwiki.sql
 		# FIXME run createAndPromote.php with $ADMIN_USERNAME
-	else
-		php /var/www/html/maintenance/update.php --quick
 	fi
 
-	if [ -n "${OPENID_ENABLED-}" ]; then
-		php /var/www/html/maintenance/update.php --quick
-	fi
+	php /var/www/html/maintenance/update.php --quick
 }
 
 init_extensions() {
+
 	if [ ! -d /var/www/html/extensions/PluggableAuth ]; then
 		git clone --depth 1 -b REL1_39 \
 			https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PluggableAuth \
@@ -71,12 +68,67 @@ init_extensions() {
 				/var/www/html/extensions/OpenIDConnect
 		fi
 	fi
+
+	if [ -n "${MOBILEFRONTEND_ENABLED-}" ]; then
+		if [ ! -d /var/www/html/extensions/MobileFrontend ]; then
+			git clone --depth 1 -b REL1_39 \
+				https://github.com/wikimedia/mediawiki-extensions-MobileFrontend.git \
+				/var/www/html/extensions/MobileFrontend
+		fi
+	fi
+
+	if [ -n "${MSU_ENABLED-}" ]; then
+		if [ ! -d /var/www/html/extensions/MsUpload ]; then
+			git clone --depth 1 -b REL1_39 \
+				https://gerrit.wikimedia.org/r/mediawiki/extensions/MsUpload \
+				/var/www/html/extensions/MsUpload
+		fi
+	fi
+
+	if [ -n "${PAGEFORMS_ENABLED-}" ]; then
+		if [ ! -d /var/www/html/extensions/PageForms ]; then
+			git clone --depth 1 -b REL1_39 \
+				https://gerrit.wikimedia.org/r/mediawiki/extensions/PageForms \
+				/var/www/html/extensions/PageForms
+		fi
+	fi
+
+	if [ -n "${PAGESCHEMAS_ENABLED-}" ]; then
+		if [ ! -d /var/www/html/extensions/PageSchemas ]; then
+			git clone --depth 1 -b REL1_39 \
+				https://gerrit.wikimedia.org/r/mediawiki/extensions/PageSchemas \
+				/var/www/html/extensions/PageSchemas
+		fi
+	fi
+
+	if [ -n "${MARKDOWN_ENABLED-}" ]; then
+		if [ ! -d /var/www/html/extensions/WikiMarkdown ]; then
+			git clone --depth 1 \
+				https://github.com/kuenzign/WikiMarkdown \
+				/var/www/html/extensions/WikiMarkdown
+		fi
+	fi
+
 }
 
+init_skins() {
+
+	if [ -n "${TWEEKI_ENABLED-}" ]; then
+		if [ ! -d /var/www/html/skins/Tweeki ]; then
+			git clone --depth 1 \
+				https://github.com/thaider/Tweeki \
+				/var/www/html/skins/Tweeki
+		fi
+	fi
+
+}
+
+
 main() {
 	set -eu
 
 	init_extensions
+	init_skins
 	init_composer
 	composer_install
 	init_db

php.ini.tmpl

@@ -2,3 +2,9 @@ upload_max_filesize = 10M
 post_max_size = 10M
 max_execution_time = 7200
 max_file_uploads = 1000
+
+{{ if eq (env "MEDIAWIKI_DEBUG") "0" }}
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+{{ else }}
+error_reporting = E_ALL
+{{ end }}