From bda1a6b603a3944223707a6d090622b574ea7505 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 29 Jul 2022 11:07:19 +0200
Subject: bump & vpn

---
 hosts/surtr/default.nix | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'hosts/surtr/default.nix')

diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index 87dd27b0..2be25560 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -2,7 +2,7 @@
 {
   imports = with flake.nixosModules.systemProfiles; [
     qemu-guest openssh rebuild-machines zfs
-    ./zfs.nix ./dns ./tls ./http ./bifrost ./matrix ./postgresql.nix ./prometheus ./email
+    ./zfs.nix ./dns ./tls ./http ./bifrost ./matrix ./postgresql.nix ./prometheus ./email ./vpn
   ];
 
   config = {
@@ -57,6 +57,7 @@
           { address = "202.61.241.61"; prefixLength = 22; }
         ];
         ipv6.addresses = [
+          { address = "2a03:4000:52:ada:98e7:16ff:feba:7a2e"; prefixLength = 128; }
           { address = "2a03:4000:52:ada::"; prefixLength = 96; }
         ];
       };
@@ -68,11 +69,15 @@
       };
     };
 
-    systemd.network.networks."40-ens3".networkConfig = {
-      Domains = lib.mkForce "~.";
-      DNS = [ "127.0.0.1:5353" "[::1]:5353" ];
-      # DNSSEC = true;
-      # DNS = [ "46.38.225.230" "46.38.252.230" "2a03:4000:0:1::e1e6" "2a03:4000:8000::fce6" ];
+    systemd.network = {
+      networks = {
+        "40-ens3".networkConfig = {
+          Domains = lib.mkForce "~.";
+          DNS = [ "127.0.0.1:5353" "[::1]:5353" ];
+          # DNSSEC = true;
+          # DNS = [ "46.38.225.230" "46.38.252.230" "2a03:4000:0:1::e1e6" "2a03:4000:8000::fce6" ];
+        };
+      };
     };
 
     services.resolved = {
@@ -85,8 +90,13 @@
       proxies = {
         ens3 = {
           router = false;
-          rules."2a03:4000:52:ada::/64" = {
-            method = "static";
+          rules = {
+            "2a03:4000:20:259::/64" = {
+              method = "static";
+            };
+            "2a03:4000:52:ada::/64" = {
+              method = "static";
+            };
           };
         };
       };
-- 
cgit v1.2.3