diff --git a/docs/mediawiki-updates.md b/docs/mediawiki-updates.md new file mode 100644 index 0000000..4f49b6b --- /dev/null +++ b/docs/mediawiki-updates.md @@ -0,0 +1,31 @@ +# Updating mediawiki docker container + +See the [mediawiki-oidc-docker repository](https://git.pub.solar/pub-solar/mediawiki-oidc-docker#updating-the-docker-image) +for instructions on updating our customized mediawiki docker image. + +To deploy a new docker image to `nachtigall`, first bump the mediawiki version +of the docker image tag in `hosts/nachtigall/apps/mediawiki.nix` (search for +`image`). + +Next, push your changes to https://git.pub.solar and get them reviewed and +approved. + +After approval, create a fresh backup of the database and deploy the changes to +`nachtigall`: + +``` +ssh barkeeper@nachtigall.pub.solar +sudo -u postgres pg_dump --create -Fc mediawiki > mediawiki-db-$(date +%F).dump +exit +``` + +``` +deploy --targets '.#nachtigall' +``` + +Then, finalize the update by running the database migration script: +``` +ssh barkeeper@nachtigall.pub.solar +docker exec -it mediawiki bash +php maintenance/run.php update.php +``` diff --git a/hosts/nachtigall/apps/mediawiki.nix b/hosts/nachtigall/apps/mediawiki.nix index 8445a79..b48f03a 100644 --- a/hosts/nachtigall/apps/mediawiki.nix +++ b/hosts/nachtigall/apps/mediawiki.nix @@ -40,7 +40,7 @@ ## 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 = "https://pub.solar/assets/pubsolar.svg"; ## UPO means: this is also a user preference option @@ -73,7 +73,7 @@ $wgImageMagickConvertCommand = "/usr/bin/convert"; # InstantCommons allows wiki to use images from https://commons.wikimedia.org - $wgUseInstantCommons = false; + $wgUseInstantCommons = true; # Periodically send a pingback to https://www.mediawiki.org/ with basic data # about this MediaWiki instance. The Wikimedia Foundation shares this data @@ -114,11 +114,12 @@ wfLoadExtension('OpenIDConnect'); wfLoadExtension('PluggableAuth'); wfLoadExtension('VisualEditor'); + wfLoadExtension('TemplateStyles'); + wfLoadExtension('QuickInstantCommons'); # End of automatically generated settings. # Add more configuration options below. - $wgLogo = "https://pub.solar/assets/pubsolar.svg"; $wgLogos = [ 'svg' => "https://pub.solar/assets/pubsolar.svg", 'icon' => "https://pub.solar/assets/pubsolar.svg", @@ -207,7 +208,7 @@ in { backend = "docker"; containers."mediawiki" = { - image = "git.pub.solar/pub-solar/mediawiki-oidc-docker:latest"; + image = "git.pub.solar/pub-solar/mediawiki-oidc-docker:1.41.0"; user = "1000:${builtins.toString gid}"; autoStart = true;