From 1d1eb043d19a9f1b0c8e8faebede7842a45dabf5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Mar 2023 23:57:07 +0100
Subject: [PATCH] ma gum.r: enable ipv6 again

---
 makefu/1systems/gum/config.nix               |  5 +++--
 makefu/1systems/gum/hetznercloud/network.nix | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 26bfd0731..e61af7a7b 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -103,6 +103,7 @@ in {
       # <stockholm/makefu/2configs/sabnzbd.nix>
       # <stockholm/makefu/2configs/mail/mail.euer.nix>
       { krebs.exim.enable = mkDefault true; }
+      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
 
       # sharing
       <stockholm/makefu/2configs/share/gum.nix> # samba sahre
@@ -125,7 +126,7 @@ in {
       <stockholm/makefu/2configs/backup/server.nix>
       <stockholm/makefu/2configs/backup/state.nix>
       <stockholm/makefu/2configs/wireguard/server.nix>
-      # <stockholm/makefu/2configs/wireguard/wiregrill.nix>
+      <stockholm/makefu/2configs/wireguard/wiregrill.nix>
 
       { # recent changes mediawiki bot
         networking.firewall.allowedUDPPorts = [ 5005 5006 ];
@@ -173,7 +174,7 @@ in {
       # <stockholm/makefu/2configs/nginx/iso.euer.nix>
 
       # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix>
-      <stockholm/makefu/2configs/deployment/graphs.nix>
+      # <stockholm/makefu/2configs/deployment/graphs.nix>
       #<stockholm/makefu/2configs/deployment/owncloud.nix>
       # <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix>
       #<stockholm/makefu/2configs/deployment/feed.euer.krebsco.de>
diff --git a/makefu/1systems/gum/hetznercloud/network.nix b/makefu/1systems/gum/hetznercloud/network.nix
index 24fe3842f..5159cf570 100644
--- a/makefu/1systems/gum/hetznercloud/network.nix
+++ b/makefu/1systems/gum/hetznercloud/network.nix
@@ -3,7 +3,7 @@ let
   external-mac = "96:00:01:24:33:f4";
   external-gw = "172.31.1.1";
   external-ip = "142.132.189.140";
-  external-ip6 = "2a01:4f8:1c17:5cdf::2/64";
+  external-ip6 = "2a01:4f8:1c17:5cdf::2";
   external-gw6 = "fe80::1";
   external-netmask = 32;
   external-netmask6 = 64;
@@ -16,19 +16,20 @@ in
     SUBSYSTEM=="net", ATTR{address}=="${external-mac}", NAME="${ext-if}"
   '';
   networking = {
+    enableIPv6 = true;
+    nat.enableIPv6 = true;
     interfaces."${ext-if}" = {
       useDHCP = true;
+      ipv6.addresses = [{
+          address = external-ip6;
+          prefixLength = external-netmask6;
+      }];
     };
     #ipv4.addresses = [{
     #  address = external-ip;
     #  prefixLength = external-netmask;
     #}];
-    #ipv6.addresses = [{
-    #    address = external-ip6;
-    #    prefixLength = external-netmask6;
-    #  }];
-    #};
-    #defaultGateway6 = { address = external-gw6; interface = ext-if; };
+    defaultGateway6 = { address = external-gw6; interface = ext-if; };
     #defaultGateway = external-gw;
     nameservers = [ "1.1.1.1" ];
   };