flake.lock

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

hosts/monitoring-3/grafana.nix

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

hosts/monitoring-3/prometheus.nix

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

hosts/web-2/chaosevents.nix

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

hosts/web-2/gitea.nix

@@ -12,6 +12,10 @@
       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 = {
@@ -26,10 +30,6 @@
         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";
-        ensureDBOwnership = true;
+        ensurePermissions."DATABASE gitea" = "ALL PRIVILEGES";
       }
     ];
   };

modules/clerie-system-upgrade/default.nix

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