From bc1248da56f02821bed33dfbb03f8a1b35179995 Mon Sep 17 00:00:00 2001 From: Winzlieb Date: Mon, 27 Jun 2022 21:59:37 +0200 Subject: [PATCH] use stable uris for mediawiki extensions --- hosts/containers/mediawiki/default.nix | 89 +++++++++++++------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/hosts/containers/mediawiki/default.nix b/hosts/containers/mediawiki/default.nix index 8063c7b9..0e08e9b2 100644 --- a/hosts/containers/mediawiki/default.nix +++ b/hosts/containers/mediawiki/default.nix @@ -1,4 +1,4 @@ -{ zentralwerk, config, lib, pkgs, ... }: +{ zentralwerk, config, lib, pkgs, ... }: let ourMediawiki = pkgs.mediawiki.overrideAttrs ({pname, ...}: rec { version = "1.38.1"; @@ -35,17 +35,17 @@ in { package = pkgs.postgresql_11; ensureDatabases = [ cfg.database.name ]; - ensureUsers = [{ + ensureUsers = [{ name = cfg.database.user; ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; - } + } ]; authentication = lib.mkForce '' # TYPE DATABASE USER ADDRESS METHOD local all all trust host all all 127.0.0.1/32 trust host all all 10.233.2.1/32 trust - host all all ::1/128 trust + host all all ::1/128 trust '';}; system.stateVersion = "22.05"; @@ -138,47 +138,46 @@ in { $wgScribuntoDefaultEngine = 'luastandalone'; ''; extensions = { - Interwiki = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/Interwiki-REL1_38-223bbf8.tar.gz"; - sha256 = "sha256-A4tQuISJNzzXPXJXv9N1jMat1VuZ7khYzk2jxoUqzIk="; - }; - Cite = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/Cite-REL1_38-d40993e.tar.gz"; - sha256 = "sha256-dziMo6sH4yMPjnDtt0TXiGBxE5uGRJM+scwdeuer5sM="; - }; - ConfirmEdit = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/ConfirmEdit-REL1_38-50f4dfd.tar.gz"; - sha256 = "sha256-iiRT98uUmy1gvKzl/5ijheAAjUK3BLewt8IG8qdCHsB="; - }; - CiteThisPage = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/CiteThisPage-REL1_38-bb4881c.tar.gz"; - sha256 = "sha256-sTZMCLlOkQBEmLiFz2BQJpWRxSDbpS40EZQ+f/jFjxI="; - }; - ParserFunctions = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/ParserFunctions-REL1_38-bc6a7c6.tar.gz"; - sha256 = "sha256-iDv4VSSFnTKEhvlVQcHHVp2hSWwDbv6jNCq1kOGuswo="; - }; - SyntaxHightlight = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/SyntaxHighlight_GeSHi-REL1_38-79031cd.tar.gz"; - sha256 = "sha256-r1NgrhSratleQ356imxmF7KmAANvWvKpAgnLkm8IdKY="; - }; - intersection = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/intersection-REL1_38-8525097.tar.gz"; - sha256 = "sha256-shgA0XLG6pgikqldOfda40hV9zC1eBp+NalGhevFq2Q="; - }; - #DynamicPageList = pkgs.fetchzip { - # url = "https://extdist.wmflabs.org/dist/extensions/DynamicPageList-REL1_38-3b7a26d.tar.gz"; - # sha256 = "sha256-WjVLks0Q9hSN2poqbKzTJhvOXog7UHJqjY2WJ4Uc64o="; - #}; - Scribunto = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/Scribunto-REL1_38-9b9271a.tar.gz"; - sha256 = "sha256-4sy2ZCnDFzx43WzfS4Enh+I0o0+sFl1RnNV4xGiyU0k="; - }; - Lockdown = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/Lockdown-REL1_38-1915db4.tar.gz"; - sha256 = "sha256-YCYsjh/3g2P8oT6IomP3UWjOoggH7jYjiiix7poOYnA="; - }; - + Interwiki = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/ea2cb04de7194300284b330104ae0bf33ef05988/Interwiki-REL1_38-223bbf8.tar.gz"; + sha256 = "sha256-A4tQuISJNzzXPXJXv9N1jMat1VuZ7khYzk2jxoUqzIk="; + }; + Cite = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/ea2cb04de7194300284b330104ae0bf33ef05988/Cite-REL1_38-7fdd57d.tar.gz"; + sha256 = "sha256-/s9byrAVjky0EeiokUEchG3ICw+Q2T6HLjbzHnl3uVE="; + }; + ConfirmEdit = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/ea2cb04de7194300284b330104ae0bf33ef05988/ConfirmEdit-REL1_38-9ae04a5.tar.gz"; + sha256 = "sha256-iiRT98uUmy1gvKzl/5ijheAAjUK3BLewt8IG8qdCHsA="; + }; + CiteThisPage = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/70e6bf9c24f552cd1f459089e7e76685e678871d/CiteThisPage-REL1_38-157e3bc.tar.gz"; + sha256 = "sha256-q2z4y4Afcq98/Dh6kQqZxeUg9fYFv9ntR+UyelHLDKc="; + }; + ParserFunctions = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/70e6bf9c24f552cd1f459089e7e76685e678871d/ParserFunctions-REL1_38-c2ccf36.tar.gz"; + sha256 = "sha256-z3Gwl/xzFBUUAm9u6ixgfJgrO5oTopXGuXEpaewUG1Y="; + }; + SyntaxHightlight = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/70e6bf9c24f552cd1f459089e7e76685e678871d/SyntaxHighlight_GeSHi-REL1_38-150f839.tar.gz"; + sha256 = "sha256-miXbsf2TdalEkUGiVrh55q3NuEtmnQQbb0f1XBmSilw="; + }; + intersection = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/70e6bf9c24f552cd1f459089e7e76685e678871d/intersection-REL1_38-8525097.tar.gz"; + sha256 = "sha256-shgA0XLG6pgikqldOfda40hV9zC1eBp+NalGhevFq2Q="; + }; + #DynamicPageList = pkgs.fetchzip { + # url = "https://extdist.wmflabs.org/dist/extensions/DynamicPageList-REL1_38-3b7a26d.tar.gz"; + # sha256 = "sha256-WjVLks0Q9hSN2poqbKzTJhvOXog7UHJqjY2WJ4Uc64o="; + #}; + Scribunto = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/70e6bf9c24f552cd1f459089e7e76685e678871d/Scribunto-REL1_38-bd2f615.tar.gz"; + sha256 = "sha256-e70P8/0CsWWftyh2LhFw/Fv3E34Bl8HIZxVszuUl8Pk="; + }; + Lockdown = pkgs.fetchzip { + url = "https://gitea.c3d2.de/C3D2/mediawiki-common-extentions/raw/commit/70e6bf9c24f552cd1f459089e7e76685e678871d/Lockdown-REL1_38-1915db4.tar.gz"; + sha256 = "sha256-YCYsjh/3g2P8oT6IomP3UWjOoggH7jYjiiix7poOYnA="; + }; }; passwordFile = pkgs.writeText "password" "topSecretF0rAll!!!!"; database = {