diff --git a/.env.sample b/.env.sample index f504abc..e99fc96 100644 --- a/.env.sample +++ b/.env.sample @@ -46,6 +46,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 diff --git a/LocalSettings.php.tmpl b/LocalSettings.php.tmpl index 49e384b..41a2833 100644 --- a/LocalSettings.php.tmpl +++ b/LocalSettings.php.tmpl @@ -5,7 +5,6 @@ if ( !defined( 'MEDIAWIKI' ) ) { exit; } - ## Uncomment this to disable output compression # $wgDisableOutputCompression = true; @@ -116,6 +115,13 @@ $wgGroupPermissions['*']['read'] = false; $wgGroupPermissions['*']['read'] = true; {{ 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': @@ -126,12 +132,10 @@ $wgDefaultSkin = "tweeki"; $wgDefaultSkin = "vector"; {{ end }} -# Enabled skins. -# The following skins were automatically enabled: -wfLoadSkin( 'MonoBook' ); -wfLoadSkin( 'Timeless' ); -wfLoadSkin( 'Vector' ); -wfLoadSkin( 'MinervaNeue' ); +{{ if eq (env "MOBILEFRONTEND_ENABLED") "1" }} +wfLoadExtension( 'MobileFrontend' ); +$wgDefaultMobileSkin = 'minerva'; +{{ end }} # Enabled extensions. Most of the extensions are enabled by adding # wfLoadExtensions('ExtensionName'); diff --git a/abra.sh b/abra.sh index 27558ac..52c49d9 100644 --- a/abra.sh +++ b/abra.sh @@ -1,8 +1,8 @@ -export LOCAL_SETTINGS_CONF_VERSION=v17 +export LOCAL_SETTINGS_CONF_VERSION=v20 export HTACCESS_CONF_VERSION=v1 -export ENTRYPOINT_CONF_VERSION=v15 +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 diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 85ac2bf..04135cc 100755 --- a/entrypoint.sh.tmpl +++ b/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 \ diff --git a/php.ini.tmpl b/php.ini.tmpl index 464a51d..fe05f3a 100644 --- a/php.ini.tmpl +++ b/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 }}