configuration/dn42/default.nix

@@ -10,8 +10,6 @@
     "net.ipv6.conf.all.forwarding" = true;
   };
 
-  networking.firewall.checkReversePath = false;
-
   # Open Firewall for BGP
   networking.firewall.allowedTCPPorts = [ 179 ];
   # Open Fireall for OSPF

hosts/carbon/configuration.nix

@@ -53,27 +53,27 @@
 
   networking.wireguard.enable = true;
   networking.wireguard.interfaces = {
-    wg-gatekeeper4 = {
+    wg-gatekeeper = {
       ips = [ "fe80::127:2/64" "169.254.127.2/24" ];
       peers = [ {
           allowedIPs = [ "0.0.0.0/0" "::/0" ];
-          endpoint = "78.47.183.82:50127";
+          endpoint = "gatekeeper.net.clerie.de:50127";
           publicKey = "y+Bk5eIHgmnq9xuBDD+fk/OIkKRZU6AE4ISx4RdDDyg=";
           persistentKeepalive = 25;
       } ];
       allowedIPsAsRoutes = false;
-      privateKeyFile = "/var/src/secrets/wireguard/wg-gatekeeper4";
+      privateKeyFile = "/var/src/secrets/wireguard/wg-gatekeeper";
     };
-    wg-porter4 = {
+    wg-porter = {
       ips = [ "fe80::138:2/64" "169.254.138.2/24" ];
       peers = [ {
           allowedIPs = [ "0.0.0.0/0" "::/0" ];
-          endpoint = "188.34.158.206:50138";
+          endpoint = "porter.net.clerie.de:50138";
           publicKey = "aP6optNE7nVk6coo+USkSDtB62rAc/isfofRML9V2HM=";
           persistentKeepalive = 25;
       } ];
       allowedIPsAsRoutes = false;
-      privateKeyFile = "/var/src/secrets/wireguard/wg-porter4";
+      privateKeyFile = "/var/src/secrets/wireguard/wg-porter";
     };
   };
 
@@ -218,11 +218,11 @@
       export all;
     };
     area 0 {
-      interface "wg-gatekeeper4" {
+      interface "wg-gatekeeper" {
         cost 80;
         type pointopoint;
       };
-      interface "wg-porter4" {
+      interface "wg-porter" {
         cost 80;
         type pointopoint;
       };
@@ -236,11 +236,11 @@
       export all;
     };
     area 0 {
-      interface "wg-gatekeeper4" {
+      interface "wg-gatekeeper" {
         cost 80;
         type pointopoint;
       };
-      interface "wg-porter4" {
+      interface "wg-porter" {
         cost 80;
         type pointopoint;
       };

hosts/web-2/clerie.nix

@@ -1,22 +0,0 @@
-{ ... }:
-
-{
-  services.nginx.virtualHosts = {
-    "www.clerie.de" = {
-      enableACME = true;
-      forceSSL = true;
-      locations."/" = {
-        return = "301 https://clerie.de$request_uri";
-      };
-    };
-
-    "clerie.de" = {
-      enableACME = true;
-      forceSSL = true;
-      root = fetchGit {
-        url = "https://git.clerie.de/clerie/clerie.de.git";
-        rev = "7fbb8042100fde4a8524eec656519eb8b48ae68a";
-      };
-    };
-  };
-}

hosts/web-2/configuration.nix

@@ -6,7 +6,6 @@
       ./hardware-configuration.nix
       ../../configuration/common
       ./bubblesort.nix
-      ./clerie.nix
       ./gitea.nix
       ./ip.nix
       ./meow.nix