From 5f6c3b9258b5bb9c4a21e743ae72aced166823d3 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 20:32:41 +0100 Subject: [PATCH 01/10] configuration/common: Remove nix experimental feature repl-flake --- configuration/common/nix.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration/common/nix.nix b/configuration/common/nix.nix index 057dbe4..ef92e63 100644 --- a/configuration/common/nix.nix +++ b/configuration/common/nix.nix @@ -26,7 +26,6 @@ experimental-features = [ "flakes" "nix-command" - "repl-flake" ]; substituters = [ "https://nix-cache.clerie.de" From d946d31c81eb17dbc2dd0f18addc58be256dff84 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 20:40:27 +0100 Subject: [PATCH 02/10] configuration/common: Pin nix version to 2.18 --- configuration/common/nix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configuration/common/nix.nix b/configuration/common/nix.nix index ef92e63..8ae4666 100644 --- a/configuration/common/nix.nix +++ b/configuration/common/nix.nix @@ -62,6 +62,8 @@ }; }; + nix.package = pkgs.nixVersions.nix_2_18; + documentation.doc.enable = false; environment.systemPackages = with pkgs; [ From 5265e6234efd7e4ba46626a55d67d8e045ab2c22 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 22:13:50 +0100 Subject: [PATCH 03/10] hosts/web-2: Update clerie.de --- hosts/web-2/clerie.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/web-2/clerie.nix b/hosts/web-2/clerie.nix index b6e3d72..93a7cf4 100644 --- a/hosts/web-2/clerie.nix +++ b/hosts/web-2/clerie.nix @@ -15,8 +15,8 @@ forceSSL = true; root = pkgs.fetchgit { url = "https://git.clerie.de/clerie/clerie.de.git"; - rev = "785693e6826c6377c3f3200274c281d2ef3317b3"; - hash = "sha256-cyTHOOm7hpPUD8paKB7Wci3RYAo6Jr/MI/Xqx4iwXwY="; + rev = "ec744cbeaf99ae4fd4832d7e594bc72bfabc8706"; + hash = "sha256-EG8UO/9ycyWjtqLUX7ydctLdIbq/j8zylEK7YYvEwmI="; }; locations."/ssh" = { extraConfig = '' From 11e6ed35cc252c5a8c5f2f2637333a25c5a96790 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 22:17:39 +0100 Subject: [PATCH 04/10] hosts/web-2: Remove bubblesort.clerie.de --- hosts/web-2/bubblesort.nix | 14 -------------- hosts/web-2/configuration.nix | 1 - 2 files changed, 15 deletions(-) delete mode 100644 hosts/web-2/bubblesort.nix diff --git a/hosts/web-2/bubblesort.nix b/hosts/web-2/bubblesort.nix deleted file mode 100644 index 2303285..0000000 --- a/hosts/web-2/bubblesort.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: -{ - services.nginx.virtualHosts = { - "bubblesort.clerie.de" = { - enableACME = true; - forceSSL = true; - root = pkgs.fetchgit { - url = "https://git.clerie.de/clerie/bubblesort_js.git"; - rev = "39d54701a11f4fb48d7e023e384a848e6bde5640"; - sha256 = "sha256-au/sbTVLDER0BbXD6cKJIpq0GcS/saiRQw46mZQWsO0="; - }; - }; - }; -} diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix index f7567e8..06390e4 100644 --- a/hosts/web-2/configuration.nix +++ b/hosts/web-2/configuration.nix @@ -5,7 +5,6 @@ [ ./hardware-configuration.nix ./blog.nix - ./bubblesort.nix ./bula22.nix ./chaosevents.nix ./clerie.nix From 75f691061b17e84911db11fa3f29e34b805a03d7 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 22:18:24 +0100 Subject: [PATCH 05/10] hosts/web-2: Remove tap.clerie.de --- hosts/web-2/configuration.nix | 1 - hosts/web-2/tap.nix | 15 --------------- 2 files changed, 16 deletions(-) delete mode 100644 hosts/web-2/tap.nix diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix index 06390e4..8891ee3 100644 --- a/hosts/web-2/configuration.nix +++ b/hosts/web-2/configuration.nix @@ -24,7 +24,6 @@ ./public.nix ./radicale.nix ./reichartstrasse.nix - ./tap.nix ./uptimestatus.nix ./wetter.nix ]; diff --git a/hosts/web-2/tap.nix b/hosts/web-2/tap.nix deleted file mode 100644 index 09582ce..0000000 --- a/hosts/web-2/tap.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: - -{ - services.nginx.virtualHosts = { - "tap.clerie.de" = { - enableACME = true; - forceSSL = true; - root = pkgs.fetchgit { - url = "https://git.clerie.de/clerie/tap.clerie.de.git"; - rev = "a90df6f6cb6dc58ab807b230527aae76c48cdcc8"; - sha256 = "sha256-GTUy98NHXvR7pG8lUWZm6wa0XjULnDTSu17C/DQuXBI="; - }; - }; - }; -} From 113a14cb9b364da47e99aa2c67d9edfb506f3bb6 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 22:21:30 +0100 Subject: [PATCH 06/10] hosts/web-2: Remove iot-data.clerie.de --- hosts/monitoring-3/prometheus.nix | 26 -------------------- hosts/web-2/configuration.nix | 1 - hosts/web-2/iot-data.nix | 40 ------------------------------- 3 files changed, 67 deletions(-) delete mode 100644 hosts/web-2/iot-data.nix diff --git a/hosts/monitoring-3/prometheus.nix b/hosts/monitoring-3/prometheus.nix index 9e9fa52..4418389 100644 --- a/hosts/monitoring-3/prometheus.nix +++ b/hosts/monitoring-3/prometheus.nix @@ -358,32 +358,6 @@ in { relabelAddressToInstance ]; } - { - job_name = "zimmer-temp"; - scrape_interval = "20s"; - scheme = "https"; - metrics_path = "/data/zimmer-temp/"; - static_configs = [ - { - targets = [ - "iot-data.clerie.de" - ]; - } - ]; - } - { - job_name = "outdoor-temp"; - scrape_interval = "20s"; - scheme = "https"; - metrics_path = "/data/outdoor-temp/"; - static_configs = [ - { - targets = [ - "iot-data.clerie.de" - ]; - } - ]; - } { job_name = "xmpp-alerts"; scrape_interval = "20s"; diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix index 8891ee3..7367202 100644 --- a/hosts/web-2/configuration.nix +++ b/hosts/web-2/configuration.nix @@ -11,7 +11,6 @@ ./drop.nix ./fieldpoc.nix ./gitea.nix - ./iot-data.nix ./ip.nix ./legal.nix ./meow.nix diff --git a/hosts/web-2/iot-data.nix b/hosts/web-2/iot-data.nix deleted file mode 100644 index 64da990..0000000 --- a/hosts/web-2/iot-data.nix +++ /dev/null @@ -1,40 +0,0 @@ -{pkgs, ...}: - -{ - users.users.iot-data = { - description = "IOT Data Service"; - group = "iot-data"; - home = "/var/lib/iot-data/"; - useDefaultShell = true; - isSystemUser = true; - }; - users.groups.iot-data = {}; - - systemd.services.iot-data = { - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - RuntimeDirectory = "iot-data"; - StateDirectory = "iot-data"; - User = "iot-data"; - Group = "iot-data"; - }; - environment = { - IOT_DATA_CONFIG = "/var/src/iot-data-config.json"; - }; - script = "gunicorn -w 1 -b [::1]:8235 iot_data:app"; - path = with pkgs; [ (python3.withPackages (ps: [ ps.gunicorn iot-data ])) ]; - }; - - services.nginx.virtualHosts = { - "iot-data.clerie.de" = { - enableACME = true; - addSSL = true; - locations."/" = { - proxyPass = "http://[::1]:8235"; - }; - extraConfig = '' - access_log off; - ''; - }; - }; -} From 8e43e4db394158442ae3d157f97843cd453c1135 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 22:23:22 +0100 Subject: [PATCH 07/10] hosts/web-2: Remove nogo2024.clerie.de --- hosts/web-2/configuration.nix | 1 - hosts/web-2/nogo2024.nix | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 hosts/web-2/nogo2024.nix diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix index 7367202..3998278 100644 --- a/hosts/web-2/configuration.nix +++ b/hosts/web-2/configuration.nix @@ -17,7 +17,6 @@ ./milchinsel.nix ./mitel-ommclient2.nix ./nix-install.nix - ./nogo2024.nix ./nurausstieg.nix ./ping.nix ./public.nix diff --git a/hosts/web-2/nogo2024.nix b/hosts/web-2/nogo2024.nix deleted file mode 100644 index 26c7433..0000000 --- a/hosts/web-2/nogo2024.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: - -{ - services.nginx.virtualHosts = { - "nogo2024.clerie.de" = { - enableACME = true; - forceSSL = true; - locations."/" = { - return = "404"; - }; - locations."= /nogo2024.ics" = { - root = pkgs.fetchgit { - url = "https://git.clerie.de/clerie/nogo2024.git"; - rev = "fdc07667e6cfa09e91eaaee488528fb842a6115d"; - sha256 = "sha256-qRviw0sQnMmrkwBO0+AWnmeqZK8wXeFxZJgmLMUtzn4="; - }; - }; - }; - }; -} From 9dc9c7aebef121eb5387e8f7e7d1428eecfca749 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 22:30:43 +0100 Subject: [PATCH 08/10] hosts/monitoring-3: Remove XMPP Alerter Prometheus scrape target --- hosts/monitoring-3/prometheus.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hosts/monitoring-3/prometheus.nix b/hosts/monitoring-3/prometheus.nix index 4418389..8657d0b 100644 --- a/hosts/monitoring-3/prometheus.nix +++ b/hosts/monitoring-3/prometheus.nix @@ -358,20 +358,6 @@ in { relabelAddressToInstance ]; } - { - job_name = "xmpp-alerts"; - scrape_interval = "20s"; - static_configs = [ - { - targets = [ - "monitoring-3.mon.clerie.de:9199" - ]; - } - ]; - relabel_configs = [ - relabelAddressToInstance - ]; - } { job_name = "hydra"; scrape_interval = "20s"; From cfe722a3cb9df120e5246131bdf1b564e2cfa980 Mon Sep 17 00:00:00 2001 From: clerie Date: Wed, 20 Nov 2024 22:31:52 +0100 Subject: [PATCH 09/10] hosts/monitoring-3: Remove some ping targets --- hosts/monitoring-3/prometheus.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hosts/monitoring-3/prometheus.nix b/hosts/monitoring-3/prometheus.nix index 8657d0b..17966eb 100644 --- a/hosts/monitoring-3/prometheus.nix +++ b/hosts/monitoring-3/prometheus.nix @@ -230,15 +230,6 @@ in { "achtbaan.nikhef.nl" "www.fem.tu-ilmenau.de" "www.heise.de" - "pe10-fd2.nodes.nethinks.com" - "pe20-fd2.nodes.nethinks.com" - "pe10-pet1.nodes.nethinks.com" - "pe20-pet1.nodes.nethinks.com" - "pe10-ffm1.nodes.nethinks.com" - "ie10-ffm2.nodes.nethinks.com" - "pe10-ffm2.nodes.nethinks.com" - "ie10-due1.nodes.nethinks.com" - "pe10-due1.nodes.nethinks.com" "matrix.bau-ha.us" "dyon.net.entr0py.de" "matrix.entr0py.de" From 1ec5017c2b3224178df8890616caa0c21eb6d58b Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Thu, 21 Nov 2024 03:04:02 +0100 Subject: [PATCH 10/10] Update nixpkgs 2024-11-21-02-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4f0c0ab..9e217be 100644 --- a/flake.lock +++ b/flake.lock @@ -288,11 +288,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1725983898, - "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": {