From f3ac60759f611c0c691707ec104c29e5879b0e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 12 Jan 2024 14:57:58 +0100 Subject: [PATCH 1/2] web01: enable zt-tcp-relay --- modules/web01/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/web01/default.nix b/modules/web01/default.nix index 655ff7c..fea353a 100644 --- a/modules/web01/default.nix +++ b/modules/web01/default.nix @@ -1,4 +1,4 @@ -{ +{ self, ... }: { imports = [ ./borgbackup.nix ./clan-merge.nix @@ -9,6 +9,7 @@ ./postfix.nix ./jobs.nix ../dev.nix + self.inputs.clan-core.clanModules.zt-tcp-relay ]; services.cloud-init.xfs.enable = true; From d6e33fbed2e8efeb719ea0caf1d1e041c7f80278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 12 Jan 2024 15:04:05 +0100 Subject: [PATCH 2/2] update clan --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 00621b5..b618d82 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ ] }, "locked": { - "lastModified": 1704028576, - "narHash": "sha256-1dQpLqhEZL5ThN4O4GAm9neXtO71+ztn/nRD5BR+QNg=", + "lastModified": 1705067547, + "narHash": "sha256-BQH65RRCecngjR2gELDvTVnnOrKIYLmJE7X7FmsMEj8=", "ref": "refs/heads/main", - "rev": "9649e43da59865e905df05132f9aa4742024290d", - "revCount": 1648, + "rev": "30c7d61bbdafc4e753b81404a8e1c3e4d6e27807", + "revCount": 1763, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1701905325, - "narHash": "sha256-lda63LmEIlDMeCgWfjr3/wb487XPllBByfrGRieyEk4=", + "lastModified": 1705017253, + "narHash": "sha256-/ysUOnF/dYJXDTxi/fi4MNN7uYKRji5CKp3EIamXB+0=", "owner": "nix-community", "repo": "disko", - "rev": "1144887c6f4d2dcbb2316a24364ef53e25b0fcfe", + "rev": "fa5db12d76f9e8ee11e572cdbe021230e48b6afa", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1703726296, - "narHash": "sha256-l/fQEjR3wAEEu1jcZWLq60BSo0r6cXspGLar+pkKZ2M=", + "lastModified": 1705017253, + "narHash": "sha256-/ysUOnF/dYJXDTxi/fi4MNN7uYKRji5CKp3EIamXB+0=", "owner": "nix-community", "repo": "disko", - "rev": "0ce1b15b99ac7c280384f136eae00b968f5b3f72", + "rev": "fa5db12d76f9e8ee11e572cdbe021230e48b6afa", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1703900474, - "narHash": "sha256-Zu+chYVYG2cQ4FCbhyo6rc5Lu0ktZCjRbSPE0fDgukI=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dd7699928e26c3c00d5d46811f1358524081062", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703499205, - "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-stable": [] }, "locked": { - "lastModified": 1703991717, - "narHash": "sha256-XfBg2dmDJXPQEB8EdNBnzybvnhswaiAkUeeDj7fa/hQ=", + "lastModified": 1704908274, + "narHash": "sha256-74W9Yyomv3COGRmKi8zvyA5tL2KLiVkBeaYmYLjXyOw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cfdbaf68d00bc2f9e071f17ae77be4b27ff72fa6", + "rev": "c0b3a5af90fae3ba95645bbf85d2b64880addd76", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1704204620, - "narHash": "sha256-u7C59X3s706W9ptqfYHLlZlropun5Fzr9eYaKAsEuN8=", + "lastModified": 1705009679, + "narHash": "sha256-oAq7o8QQ6/raGaKUF+IYYs2752CzfFPxw3KFBOW3Q48=", "owner": "numtide", "repo": "srvos", - "rev": "e5eecdf21bdf048cef7cb9e52bf573fdf959d491", + "rev": "905cdf0751894d23ff4d6cb3c0235099a3f2cdf2", "type": "github" }, "original": { @@ -221,11 +221,11 @@ ] }, "locked": { - "lastModified": 1702979157, - "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", + "lastModified": 1704649711, + "narHash": "sha256-+qxqJrZwvZGilGiLQj3QbYssPdYCwl7ejwMImgH7VBQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2961375283668d867e64129c22af532de8e77734", + "rev": "04f25d7bec9fb29d2c3bacaa48a3304840000d36", "type": "github" }, "original": {