From 055c435037e287bf846b5831983b5137f9ebfa05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 27 Dec 2023 14:34:23 +0100 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22' (2023-11-25) → 'github:nix-community/disko/1b191113874dee97796749bb21eac3d84735c70a' (2023-12-25) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01) → 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8' (2023-11-24) → 'github:NixOS/nixpkgs/5f64a12a728902226210bf01d25ec6cbb9d9265b' (2023-12-24) • Updated input 'sops-nix': 'github:Mic92/sops-nix/4be58d802693d7def8622ff34d36714f8db40371' (2023-11-26) → 'github:Mic92/sops-nix/e523e89763ff45f0a6cf15bcb1092636b1da9ed3' (2023-12-24) • Updated input 'srvos': 'github:numtide/srvos/396f6d3fa41a594b7ea02fa0d34f0c6975983e6e' (2023-11-24) → 'github:numtide/srvos/52d07db520046c4775f1047e68a05dcb53bba9ec' (2023-12-25) • Removed input 'srvos/nixos-23_05' • Added input 'srvos/nixos-stable': 'github:NixOS/nixpkgs/d65bceaee0fb1e64363f7871bc43dc1c6ecad99f' (2023-12-20) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12) → 'github:numtide/treefmt-nix/2961375283668d867e64129c22af532de8e77734' (2023-12-19) --- flake.lock | 38 +++++++++++++++++++------------------- flake.nix | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 22aa1c9..dc6e625 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700927249, - "narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=", + "lastModified": 1703532766, + "narHash": "sha256-ojjW3cuNmqL5uqDWohwLoO8dYpheM5+AfgsNmGIMwG8=", "owner": "nix-community", "repo": "disko", - "rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22", + "rev": "1b191113874dee97796749bb21eac3d84735c70a", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700794826, - "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "nixpkgs-stable": [] }, "locked": { - "lastModified": 1700967639, - "narHash": "sha256-uuUwD/O1QcVk+TWPZFwl4ioUkC8iACj0jEXSyE/wGPI=", + "lastModified": 1703387502, + "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4be58d802693d7def8622ff34d36714f8db40371", + "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", "type": "github" }, "original": { @@ -89,7 +89,7 @@ }, "srvos": { "inputs": { - "nixos-23_05": [ + "nixos-stable": [ "nixpkgs" ], "nixpkgs": [ @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1700815597, - "narHash": "sha256-7xz5LhCvULziXmCuim896vVoHXodwsamtwlr8lsA8RM=", + "lastModified": 1703469109, + "narHash": "sha256-hTQJ9uV43Vt8UXwervEj9mbDoQSN1mD3lwwPChG8jy8=", "owner": "numtide", "repo": "srvos", - "rev": "396f6d3fa41a594b7ea02fa0d34f0c6975983e6e", + "rev": "52d07db520046c4775f1047e68a05dcb53bba9ec", "type": "github" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1699786194, - "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "lastModified": 1702979157, + "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "rev": "2961375283668d867e64129c22af532de8e77734", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4077947..a659bd6 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ srvos.url = "github:numtide/srvos"; # Use the version of nixpkgs that has been tested to work with SrvOS srvos.inputs.nixpkgs.follows = "nixpkgs"; - srvos.inputs.nixos-23_05.follows = "nixpkgs"; + srvos.inputs.nixos-stable.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; From 1ee86bb22474a39f9852e7ae686e56be0f646cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 27 Dec 2023 15:18:42 +0100 Subject: [PATCH 2/3] fix StopForumSpam extension --- modules/nixos-wiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos-wiki/default.nix b/modules/nixos-wiki/default.nix index e2631f9..a3928c5 100644 --- a/modules/nixos-wiki/default.nix +++ b/modules/nixos-wiki/default.nix @@ -55,8 +55,8 @@ in }; # Github login extensions.ConfirmEdit = null; # Combat SPAM with a simple Captcha extensions.StopForumSpam = pkgs.fetchzip { - url = "https://extdist.wmflabs.org/dist/extensions/StopForumSpam-REL1_40-71b57ba.tar.gz"; - hash = "sha256-g8v4zr11c2e4bY0BNipJ48miyAF4WTNvlSMgb/NxPBA="; + url = "https://extdist.wmflabs.org/dist/extensions/StopForumSpam-REL1_41-0abdc44.tar.gz"; + hash = "sha256-FLaL8ztlJtUPh76/3WCFPKuH2+gjz1paaWWZ8pu66hA="; }; extraConfig = '' From e7b0b5bf3e678566f83e65a0d8976c6580f05168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 27 Dec 2023 15:18:56 +0100 Subject: [PATCH 3/3] fix nixos test --- checks/test.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/test.nix b/checks/test.nix index 07c2b6f..e5e1649 100644 --- a/checks/test.nix +++ b/checks/test.nix @@ -6,6 +6,9 @@ imports = [ self.nixosModules.nixos-wiki ]; + networking.extraHosts = '' + 127.0.0.1 nixos-wiki.example.com + ''; security.acme.defaults.email = "admin@example.com"; services.nixos-wiki = { hostname = "nixos-wiki.example.com"; @@ -29,7 +32,7 @@ machine.wait_for_unit("phpfpm-mediawiki.service") machine.wait_for_unit("nginx.service") - page = machine.succeed("curl -vL http://localhost/") + page = machine.succeed("curl -vL http://nixos-wiki.example.com/") assert "MediaWiki has been installed" in page ''; }