enable choice of language

Reviewed-on: coop-cloud/mediawiki#31

.env.sample

@@ -10,6 +10,7 @@ MEDIAWIKI_SITENAMESPACE="Example_Wiki"
 MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com"
 MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
 MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
+MEDIAWIKI_LANGUAGE="en"
 
 MEDIAWIKI_IS_PRIVATE=1
 
@@ -46,6 +47,12 @@ SECRET_MEDIAWIKI_SECRET_KEY_VERSION=v1 # length=64
 # OPENID_CLIENT_ID="mediawiki"
 # SECRET_OPENID_CLIENT_SECRET_VERSION=v1
 
+## WikiMarkdown
+#MARKDOWN_ENABLED=1
+
+## MobileFrontend
+#MOBILEFRONTEND_ENABLED=1
+
 ## MsUpload
 #MSU_ENABLED=1
 
@@ -61,3 +68,6 @@ SECRET_MEDIAWIKI_SECRET_KEY_VERSION=v1 # length=64
 ## 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'));
 
@@ -116,15 +115,27 @@ $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";
-
 # 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 +154,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' );
 

abra.sh

@@ -1,8 +1,8 @@
-export LOCAL_SETTINGS_CONF_VERSION=v12
+export LOCAL_SETTINGS_CONF_VERSION=v21
 export HTACCESS_CONF_VERSION=v1
-export ENTRYPOINT_CONF_VERSION=v11
+export ENTRYPOINT_CONF_VERSION=v19
 export COMPOSER_LOCAL_CONF_VERSION=v5
-export PHP_INI_VERSION=v2
+export PHP_INI_VERSION=v4
 
 export SAML_ENTRYPOINT_CONF_VERSION=v3
 

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
@@ -45,7 +45,7 @@ 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.3.0+1.39.3"
     entrypoint: /docker-entrypoint2.sh
 
   db:
@@ -63,14 +63,6 @@ services:
     networks:
       - internal
 
-  parsoid:
-    image: thenets/parsoid:0.11.0
-    hostname: parsoidserver
-    networks:
-      - internal
-    environment:
-      PARSOID_DOMAIN_localhost: http://app:80/api.php
-
 volumes:
   mariadb:
   mediawiki_images:

entrypoint.sh.tmpl

@@ -53,6 +53,7 @@ init_db() {
 }
 
 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 \
@@ -75,6 +76,14 @@ init_extensions() {
 		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 \
@@ -109,10 +118,24 @@ init_extensions() {
 
 }
 
+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

@@ -5,4 +5,6 @@ max_file_uploads = 1000
 
 {{ if eq (env "MEDIAWIKI_DEBUG") "0" }}
 error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+{{ else }}
+error_reporting = E_ALL
 {{ end }}