Update from updated-inputs-2024-03-25-02-03

flake.lock

@@ -90,11 +90,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1687119570,
+        "lastModified": 1711287766,
-        "narHash": "sha256-tZ6hctUdlZzsdg4WA4Fv7C5bNGnotYp0QT+s3rvlIKw=",
+        "narHash": "sha256-2roymGPfsQZC1Lg/i3iffBQ8c86DLEXmuoKQIlbOg5o=",
         "ref": "refs/heads/main",
-        "rev": "cc43776e6dd7eb94962e9f23b8e8282d34597a75",
+        "rev": "f707f212378f9d8de103ac96abcd9d377a2605a8",
-        "revCount": 39,
+        "revCount": 56,
         "type": "git",
         "url": "https://git.clerie.de/clerie/fieldpoc.git"
       },

hosts/monitoring-3/grafana.nix

@@ -2,11 +2,17 @@
 {
   services.grafana = {
     enable  = true;
-    domain  = "grafana.monitoring.clerie.de";
+    settings = {
-    rootUrl = "https://grafana.monitoring.clerie.de";
+      server = {
-    port    = 3001;
+        domain = "grafana.monitoring.clerie.de";
-    addr = "::1";
+        root_url = "https://grafana.monitoring.clerie.de";
-    auth.anonymous.enable = true;
+        http_port = 3001;
+        http_addr = "::1";
+      };
+      "auth.anonymous" = {
+        enabled = true;
+      };
+    };
 
     provision = {
       enable = true;

hosts/monitoring-3/prometheus.nix

@@ -294,6 +294,66 @@ in {
           relabelAddressToInstance
         ];
       }
+      {
+        job_name = "blackbox_local_icmp6_1s";
+        scrape_interval = "1s";
+        metrics_path = "/probe";
+        params = {
+          module = [ "icmp6" ];
+        };
+        static_configs = [
+          {
+            targets = [
+              "carbon.net.clerie.de"
+            ];
+          }
+        ];
+        relabel_configs = [
+          {
+            source_labels = [ "__address__" ];
+            target_label = "__param_target";
+          }
+          {
+            source_labels = [ "__address__" ];
+            target_label = "target";
+          }
+          {
+            target_label = "__address__";
+            replacement = "monitoring-3.mon.clerie.de:9115";
+          }
+          relabelAddressToInstance
+        ];
+      }
+      {
+        job_name = "blackbox_local_icmp4_1s";
+        scrape_interval = "1s";
+        metrics_path = "/probe";
+        params = {
+          module = [ "icmp4" ];
+        };
+        static_configs = [
+          {
+            targets = [
+              "carbon.net.clerie.de"
+            ];
+          }
+        ];
+        relabel_configs = [
+          {
+            source_labels = [ "__address__" ];
+            target_label = "__param_target";
+          }
+          {
+            source_labels = [ "__address__" ];
+            target_label = "target";
+          }
+          {
+            target_label = "__address__";
+            replacement = "monitoring-3.mon.clerie.de:9115";
+          }
+          relabelAddressToInstance
+        ];
+      }
       {
         job_name = "zimmer-temp";
         scrape_interval = "20s";

hosts/storage-2/syncthing.nix

@@ -3,18 +3,20 @@
 {
   services.syncthing = {
     enable = true;
-    devices = {
+    settings = {
-      ceasium = { id = "3JVJ2KS-C44JKLL-LFIMCVJ-VUQK2VB-WKJNOGB-4AIJYJM-MINXEKG-T5FHQQE"; };
+      devices = {
-      ev0 = { id = "XLZNAIG-Q5BJYXZ-IJWS3RD-EOETGFI-265U5MH-U4VBEXX-KC6MWPH-B22ROQT"; };
+        ceasium = { id = "3JVJ2KS-C44JKLL-LFIMCVJ-VUQK2VB-WKJNOGB-4AIJYJM-MINXEKG-T5FHQQE"; };
-    };
+        ev0 = { id = "XLZNAIG-Q5BJYXZ-IJWS3RD-EOETGFI-265U5MH-U4VBEXX-KC6MWPH-B22ROQT"; };
-    folders = {
+      };
-      mixcloud = {
+      folders = {
-        path = "/data/mixcloud";
+        mixcloud = {
-        type = "sendonly";
+          path = "/data/mixcloud";
-        devices = [
+          type = "sendonly";
-          "ceasium"
+          devices = [
-          "ev0"
+            "ceasium"
-        ];
+            "ev0"
+          ];
+        };
       };
     };
   };

hosts/web-2/chaosevents.nix

@@ -22,6 +22,7 @@
 
   systemd.services."chaosevents" = {
     wantedBy = [ "multi-user.target" ];
+    requires = [ "network.target" ];
     after = [ "network.target" ];
     serviceConfig = {
       Type = "oneshot";
@@ -41,6 +42,7 @@
       OnCalendar = "hourly";
       RandomizedDelaySec = "1h";
     };
+    requires = [ "network-online.target" ];
     after = [ "network-online.target" ];
   };
 }

hosts/web-2/gitea.nix

@@ -12,10 +12,6 @@
       user = "gitea";
       socket = "/run/postgresql";
     };
-    rootUrl = "https://git.clerie.de/";
-    domain = "git.clerie.de";
-    httpAddress =  "127.0.0.1";
-    httpPort = 3000;
     lfs.enable = true;
     settings = {
       log = {
@@ -30,6 +26,10 @@
         DEFAULT_PRIVATE = true;
       };
       server = {
+        ROOT_URL = "https://git.clerie.de/";
+        DOMAIN = "git.clerie.de";
+        HTTP_ADDRESS = "127.0.0.1";
+        HTTP_PORT = 3000;
         OFFLINE_MODE = true;
         LANDING_PAGE = "explore";
       };
@@ -66,7 +66,7 @@
     ensureUsers = [
       {
         name = "gitea";
-        ensurePermissions."DATABASE gitea" = "ALL PRIVILEGES";
+        ensureDBOwnership = true;
       }
     ];
   };

modules/clerie-system-upgrade/default.nix

@@ -21,7 +21,7 @@ in
         description = "Automatically check and install upgrades";
       };
       startAt = mkOption {
-        type = with types; nullOr string;
+        type = with types; nullOr str;
         default = null;
         description = "Systemd time string for starting the unit";
       };