From 3fd089cfb180b4594b5db3dc4eb1ade53da75d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 29 Jun 2022 00:06:28 +0200
Subject: [PATCH] Fix TLS, format, fix hash for CiteThis extension

---
 hosts/containers/mediawiki/default.nix | 68 +++++++++++++-------------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/hosts/containers/mediawiki/default.nix b/hosts/containers/mediawiki/default.nix
index 40fbaa08..b5c6b825 100644
--- a/hosts/containers/mediawiki/default.nix
+++ b/hosts/containers/mediawiki/default.nix
@@ -17,8 +17,6 @@ in
     mounts = [ "etc" "home" "var" ];
   };
 
-  security.acme.defaults.server = "https://acme-staging-v02.api.letsencrypt.org/directory";
-
   services.postgresql =
     let
       cfg = config.services.mediawiki;
@@ -119,38 +117,38 @@ in
         $wgNamespacePermissionLockdown[NS_INTERN]['*'] = array('intern');
         $wgNamespacePermissionLockdown[NS_INTERN_TALK]['*'] = array('intern');
 
-         define("NS_I4R", 102);
-         define("NS_I4R_TALK", 103);
-         $wgExtraNamespaces[NS_I4R] = "IT4Refugees";
-         $wgExtraNamespaces[NS_I4R_TALK] = "IT4Refugees_Diskussion";
-         $wgGroupPermissions['i4r']['move']             = true;
-         $wgGroupPermissions['i4r']['move-subpages']    = true;
-         $wgGroupPermissions['i4r']['move-rootuserpages'] = true; // can move root userpages
-         $wgGroupPermissions['i4r']['read']             = true;
-         $wgGroupPermissions['i4r']['edit']             = true;
-         $wgGroupPermissions['i4r']['createpage']       = true;
-         $wgGroupPermissions['i4r']['createtalk']       = true;
-         $wgGroupPermissions['i4r']['writeapi']         = true;
-         $wgGroupPermissions['i4r']['upload']           = true;
-         $wgGroupPermissions['i4r']['reupload']         = true;
-         $wgGroupPermissions['i4r']['reupload-shared']  = true;
-         $wgGroupPermissions['i4r']['minoredit']        = true;
-         $wgGroupPermissions['i4r']['purge']            = true; // can use ?action=purge without clicking "ok"
-         $wgGroupPermissions['i4r']['sendemail']        = true;
-         $wgNamespacePermissionLockdown[NS_I4R]['*'] = array('i4r');
-         $wgNamespacePermissionLockdown[NS_I4R_TALK]['*'] = array('i4r');
+        define("NS_I4R", 102);
+        define("NS_I4R_TALK", 103);
+        $wgExtraNamespaces[NS_I4R] = "IT4Refugees";
+        $wgExtraNamespaces[NS_I4R_TALK] = "IT4Refugees_Diskussion";
+        $wgGroupPermissions['i4r']['move']             = true;
+        $wgGroupPermissions['i4r']['move-subpages']    = true;
+        $wgGroupPermissions['i4r']['move-rootuserpages'] = true; // can move root userpages
+        $wgGroupPermissions['i4r']['read']             = true;
+        $wgGroupPermissions['i4r']['edit']             = true;
+        $wgGroupPermissions['i4r']['createpage']       = true;
+        $wgGroupPermissions['i4r']['createtalk']       = true;
+        $wgGroupPermissions['i4r']['writeapi']         = true;
+        $wgGroupPermissions['i4r']['upload']           = true;
+        $wgGroupPermissions['i4r']['reupload']         = true;
+        $wgGroupPermissions['i4r']['reupload-shared']  = true;
+        $wgGroupPermissions['i4r']['minoredit']        = true;
+        $wgGroupPermissions['i4r']['purge']            = true; // can use ?action=purge without clicking "ok"
+        $wgGroupPermissions['i4r']['sendemail']        = true;
+        $wgNamespacePermissionLockdown[NS_I4R]['*'] = array('i4r');
+        $wgNamespacePermissionLockdown[NS_I4R_TALK]['*'] = array('i4r');
 
-         $wgGroupPermissions['sysop']['deletelogentry'] = true;
-         $wgGroupPermissions['sysop']['deleterevision'] = true;
+        $wgGroupPermissions['sysop']['deletelogentry'] = true;
+        $wgGroupPermissions['sysop']['deleterevision'] = true;
 
-         $wgEnableAPI = true;
-         $wgAllowUserCss = true;
-         $wgUseAjax = true;
-         $wgEnableMWSuggest = true;
+        $wgEnableAPI = true;
+        $wgAllowUserCss = true;
+        $wgUseAjax = true;
+        $wgEnableMWSuggest = true;
 
-         //TODO what about $wgUpgradeKey ?
+        //TODO what about $wgUpgradeKey ?
 
-         $wgScribuntoDefaultEngine = 'luastandalone';
+        $wgScribuntoDefaultEngine = 'luastandalone';
       '';
       # see https://extdist.wmflabs.org/dist/extensions/ for list of extensions
       # save them on https://web.archive.org/save and copy the final URL below
@@ -169,16 +167,16 @@ in
         };
         CiteThisPage = pkgs.fetchzip {
           url = "https://web.archive.org/web/20220627203556/https://extdist.wmflabs.org/dist/extensions/CiteThisPage-REL1_38-bb4881c.tar.gz";
-          sha256 = "sha256-r1NgrhSratleQ356imxmF7KmAANvWvKpAgnLkm8IdKY=";
+          sha256 = "sha256-sTZMCLlOkQBEmLiFz2BQJpWRxSDbpS40EZQ+f/jFjxI=";
         };
         ParserFunctions = pkgs.fetchzip {
           url = "https://web.archive.org/web/20220627203519/https://extdist.wmflabs.org/dist/extensions/ParserFunctions-REL1_38-bc6a7c6.tar.gz";
           sha256 = "sha256-iDv4VSSFnTKEhvlVQcHHVp2hSWwDbv6jNCq1kOGuswo=";
         };
-        #SyntaxHightlight = pkgs.fetchzip {
-        #  url = "https://web.archive.org/web/20220627203440/https://extdist.wmflabs.org/dist/extensions/SyntaxHighlight_GeSHi-REL1_38-79031cd.tar.gz";
-        #  sha256 = "sha256-r1NgrhSratleQ356imxmF7KmAANvWvKpAgnLkm8IdKY=";
-        #};
+        SyntaxHightlight = pkgs.fetchzip {
+          url = "https://web.archive.org/web/20220627203440/https://extdist.wmflabs.org/dist/extensions/SyntaxHighlight_GeSHi-REL1_38-79031cd.tar.gz";
+          sha256 = "sha256-r1NgrhSratleQ356imxmF7KmAANvWvKpAgnLkm8IdKY=";
+        };
         intersection = pkgs.fetchzip {
           url = "https://web.archive.org/web/20220627203336/https://extdist.wmflabs.org/dist/extensions/intersection-REL1_38-8525097.tar.gz";
           sha256 = "sha256-shgA0XLG6pgikqldOfda40hV9zC1eBp+NalGhevFq2Q=";