Merge branch 'main' into simplesaml

.envrc.sample

@@ -7,6 +7,7 @@ export MEDIAWIKI_SITENAME="Example Wiki"
 export MEDIAWIKI_SITENAMESPACE="Example_Wiki"
 export MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com"
 export MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
+export MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
 
 export DB_ROOT_PASSWORD_VERSION=v1
 export DB_PASSWORD_VERSION=v1

LocalSettings.php.tmpl

@@ -39,7 +39,7 @@ $wgResourceBasePath = $wgScriptPath;
 
 ## The URL path to the logo.  Make sure you change this from the default,
 ## or else you'll overwrite your logo when you upgrade!
-$wgLogo = "$wgResourceBasePath/resources/assets/wiki.png";
+$wgLogo = "{{ env "MEDIAWIKI_LOGO_FILE" }}";
 
 ## UPO means: this is also a user preference option
 
@@ -132,11 +132,19 @@ wfLoadSkin( 'MonoBook' );
 wfLoadSkin( 'Timeless' );
 wfLoadSkin( 'Vector' );
 
+# Enabled extensions. Most of the extensions are enabled by adding
+# wfLoadExtensions('ExtensionName');
+# to LocalSettings.php. Check specific extension documentation for more details.
+# The following extensions were automatically enabled:
+wfLoadExtension( 'VisualEditor' );
+
+wfLoadExtension( 'Interwiki' );
+wfLoadExtension( 'Cite' );
+wfLoadExtension( 'ParserFunctions' );
+
 # End of automatically generated settings.
 # Add more configuration options below.
 
-wfLoadExtension( 'VisualEditor' );
-
 $wgDefaultUserOptions['visualeditor-enable'] = 1;
 
 $wgVisualEditorAllowLossySwitching = false;

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}