From 24bc378143468b2d516b4ac7866655e4eb1ec3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 22 Dec 2022 21:25:53 +0100
Subject: [PATCH] Replace copy pasted hosts entry with option

---
 config/default.nix            |  6 +++++-
 hosts/gitea/default.nix       |  6 ++----
 hosts/hedgedoc/default.nix    | 24 +++++++++---------------
 hosts/hydra/default.nix       |  8 +++-----
 hosts/mailtngbert/default.nix |  8 +-------
 hosts/mastodon/default.nix    | 10 +++-------
 6 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/config/default.nix b/config/default.nix
index ea1868a0..b4c64236 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, zentralwerk, ... }:
 
 # this file contains default configuration that may be turned on depending on other config settings.
 # options should go to modules.
@@ -71,6 +71,10 @@ lib.mkMerge [
         enable = true;
         permitRootLogin = "prohibit-password";
       };
+      portunus = with zentralwerk.lib.config.site.net.serv; {
+        externalIp4 = hosts4.auth;
+        externalIp6 = hosts6.up4.auth;
+      };
     };
 
     programs = {
diff --git a/hosts/gitea/default.nix b/hosts/gitea/default.nix
index b4261d86..790d37a1 100644
--- a/hosts/gitea/default.nix
+++ b/hosts/gitea/default.nix
@@ -7,10 +7,6 @@
 
   networking = {
     hostName = "gitea";
-    hosts = with zentralwerk.lib.config.site.net.serv; {
-      ${hosts6.up4.auth} = [ "auth.c3d2.de" ];
-      ${hosts4.auth} = [ "auth.c3d2.de" ];
-    };
     firewall.allowedTCPPorts = [ 2222 ];
   };
 
@@ -139,6 +135,8 @@
           X11Forwarding no
       '';
     };
+
+    portunus.addToHosts = true;
   };
 
   programs.msmtp = {
diff --git a/hosts/hedgedoc/default.nix b/hosts/hedgedoc/default.nix
index 0510dbb5..2717f4d6 100644
--- a/hosts/hedgedoc/default.nix
+++ b/hosts/hedgedoc/default.nix
@@ -11,13 +11,7 @@
     "net.netfilter.nf_conntrack_max" = "65536";
   };
 
-  networking = {
-    hostName = "hedgedoc";
-    hosts = with zentralwerk.lib.config.site.net.serv; {
-      ${hosts6.up4.auth} = [ "auth.c3d2.de" ];
-      ${hosts4.auth} = [ "auth.c3d2.de" ];
-    };
-  };
+  networking.hostName = "hedgedoc";
 
   services = {
     hedgedoc = {
@@ -75,19 +69,19 @@
       };
     };
 
+    portunus.addToHosts = true;
+
     postgresql = {
       enable = true;
       ensureDatabases = [
         "hedgedoc"
       ];
-      ensureUsers = [
-        {
-          name = "hedgedoc";
-          ensurePermissions = {
-            "DATABASE \"hedgedoc\"" = "ALL PRIVILEGES";
-          };
-        }
-      ];
+      ensureUsers = [ {
+        name = "hedgedoc";
+        ensurePermissions = {
+          "DATABASE \"hedgedoc\"" = "ALL PRIVILEGES";
+        };
+      }];
       package = pkgs.postgresql_14;
     };
   };
diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix
index fbfe80fc..af07c907 100644
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@@ -101,10 +101,6 @@ in
   # };
 
   networking = {
-    hosts = with zentralwerk.lib.config.site.net.serv; {
-      ${hosts6.up4.auth} = [ "auth.c3d2.de" ];
-      ${hosts4.auth} = [ "auth.c3d2.de" ];
-    };
     hostName = "hydra";
     firewall.enable = false;
     nameservers = [ "172.20.73.8" "9.9.9.9" ];
@@ -233,9 +229,11 @@ in
         };
       };
 
-    smartd.enable = true;
+    portunus.addToHosts = true;
 
     resolved.enable = false;
+
+    smartd.enable = true;
   };
 
   sops = {
diff --git a/hosts/mailtngbert/default.nix b/hosts/mailtngbert/default.nix
index 5ba92b36..de125a9a 100644
--- a/hosts/mailtngbert/default.nix
+++ b/hosts/mailtngbert/default.nix
@@ -46,14 +46,8 @@ in
     group = config.users.users.dovecot2.group;
   };
 
-  networking = {
-    hosts = with zentralwerk.lib.config.site.net.serv; {
-      ${hosts6.up4.auth} = [ "auth.c3d2.de" ];
-      ${hosts4.auth} = [ "auth.c3d2.de" ];
-    };
-  };
-
   services = {
+    portunus.addToHosts = true;
     postfix = {
       enable = true;
       enableSmtp = true;
diff --git a/hosts/mastodon/default.nix b/hosts/mastodon/default.nix
index 424aecd7..0dd553f2 100644
--- a/hosts/mastodon/default.nix
+++ b/hosts/mastodon/default.nix
@@ -7,13 +7,7 @@
     needForSpeed = true;
   };
 
-  networking = {
-    hostName = "mastodon";
-    hosts = with zentralwerk.lib.config.site.net.serv; {
-      ${hosts6.up4.auth} = [ "auth.c3d2.de" ];
-      ${hosts4.auth} = [ "auth.c3d2.de" ];
-    };
-  };
+  networking.hostName = "mastodon";
 
   nixpkgs.config.allowUnfreePredicate = pkg: lib.getName pkg == "elasticsearch";
 
@@ -152,6 +146,8 @@
       "social.c3d2.de"
     ];
 
+    portunus.addToHosts = true;
+
     postgresql = {
       enable = true;
       ensureUsers = [{