flake.lock

@@ -9,11 +9,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694793763,
-        "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=",
+        "lastModified": 1694734964,
+        "narHash": "sha256-FvBMAbl6EMFVODzgaEwQ9z7tfGMQvDeyc0YZ5ArPYPE=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "572baca9b0c592f71982fca0790db4ce311e3c75",
+        "rev": "20deb735cc405831ba04a0088fecb3887aa255c0",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1694793618,
-        "narHash": "sha256-f3LZHT3shYZHFzxV9cJASwDYYyeV7cVBr/DyQiha4Yw=",
+        "lastModified": 1687119570,
+        "narHash": "sha256-tZ6hctUdlZzsdg4WA4Fv7C5bNGnotYp0QT+s3rvlIKw=",
         "ref": "refs/heads/main",
-        "rev": "da0df6bab4300ad3782eae0d5c5bd917c2e6fe19",
-        "revCount": 40,
+        "rev": "cc43776e6dd7eb94962e9f23b8e8282d34597a75",
+        "revCount": 39,
         "type": "git",
         "url": "https://git.clerie.de/clerie/fieldpoc.git"
       },
@@ -215,11 +215,11 @@
     },
     "nixpkgs-krypton": {
       "locked": {
-        "lastModified": 1694767346,
-        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
+        "lastModified": 1694422566,
+        "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
+        "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
     },
     "nixpkgs-schule": {
       "locked": {
-        "lastModified": 1694767346,
-        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
+        "lastModified": 1694422566,
+        "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
+        "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
         "type": "github"
       },
       "original": {
@@ -247,11 +247,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1694767346,
-        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
+        "lastModified": 1694422566,
+        "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
+        "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
         "type": "github"
       },
       "original": {

hosts/aluminium/configuration.nix

@@ -21,12 +21,40 @@
 
   networking.hostName = "aluminium";
 
-  services.wg-clerie = {
+  networking.iproute2.enable = true;
+  networking.iproute2.rttablesExtraConfig = ''
+    200 wg-clerie
+  '';
+
+  petabyte.policyrouting = {
     enable = true;
-    ipv6s = [ "2a01:4f8:c0c:15f1::8106/128" ];
-    ipv4s = [ "10.20.30.106/32" ];
+    rules6 = [
+      { rule = "from 2a01:4f8:c0c:15f1::8106/128 lookup wg-clerie"; prio = 20000; }
+      { rule = "from 2a01:4f8:c0c:15f1::8106/128 unreachable"; prio = 20001; }
+    ];
+    rules4 = [
+      { rule = "from 10.20.30.106/32 lookup wg-clerie"; prio = 20000; }
+      { rule = "from 10.20.30.106/32 unreachable"; prio = 20001; }
+    ];
+  };
+
+
+  networking.wireguard.enable = true;
+  networking.wireguard.interfaces = {
+    wg-clerie = {
+      ips = [ "2a01:4f8:c0c:15f1::8106/128" "10.20.30.106/32" ];
+      table = "wg-clerie";
+      peers = [
+        {
+          endpoint = "vpn.clerie.de:51820";
+          persistentKeepalive = 25;
+          allowedIPs = [ "0.0.0.0/0" "::/0" "10.20.30.0/24" "2a01:4f8:c0c:15f1::/113" ];
+          publicKey = "2p1Jqs3bkXbXHFWE6vp1yxHIFoUaZQEARS2nJzbkuBA=";
+        }
+      ];
       privateKeyFile = "/var/src/secrets/wireguard/wg-clerie";
     };
+  };
 
   clerie.monitoring = {
     enable = true;

hosts/web-2/configuration.nix

@@ -10,7 +10,6 @@
       ./chaosevents.nix
       ./clerie.nix
       ./drop.nix
-      ./fieldpoc.nix
       ./gitea.nix
       ./iot-data.nix
       ./ip.nix
@@ -19,6 +18,7 @@
       ./milchinsel.nix
       ./mitel-ommclient2.nix
       ./ping.nix
+      ./prediger.nix
       ./public.nix
       ./radicale.nix
       ./reichartstrasse.nix

hosts/web-2/fieldpoc.nix

@@ -1,19 +0,0 @@
-{ ... }: {
-  services.update-from-hydra.paths.fieldpoc = {
-    enable = true;
-    hydraUrl = "https://hydra.clerie.de";
-    hydraProject = "clerie";
-    hydraJobset = "fieldpoc";
-    hydraJob = "packages.x86_64-linux.docs";
-    nixStoreUri = "https://nix-cache.clerie.de";
-    resultPath = "/srv/fieldpoc";
-  };
-
-  services.nginx.virtualHosts = {
-    "fieldpoc.clerie.de" = {
-      enableACME = true;
-      forceSSL = true;
-      root = "/srv/fieldpoc";
-    };
-  };
-}

hosts/web-2/prediger.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  services.nginx.virtualHosts = {
+    "prediger.riese.space" = {
+      enableACME = true;
+      forceSSL = true;
+      root = pkgs.fetchgit {
+        url = "https://git.clerie.de/clerie/prediger.riese.space.git";
+        rev = "7f51e884ccf8a258838adb1d825bc51eeef2f475";
+        sha256 = "sha256-tL+k9l0fX4dc971y4EWGM++BvjfnvRAtU/LvS2QYANU=";
+      };
+      locations."/map/" = {
+        alias = pkgs.fetchgit {
+          url = "https://git.clerie.de/quiribi/Prediger-workadventure.git";
+          rev = "304850367aad275c3410005580313dac7fe24788";
+          sha256 = "sha256-t6C7k5p6ZKfQedumTqxEmGYQqgaE3OiK5q41dDWnz/Y=";
+        } + "/";
+        extraConfig = ''
+          add_header Access-Control-Allow-Origin *;
+        '';
+      };
+    };
+  };
+}