Replace copy pasted hosts entry with option

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 = {

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 = {

hosts/hedgedoc/default.nix

@@ -11,13 +11,7 @@
     "net.netfilter.nf_conntrack_max" = "65536";
   };
 
-  networking = {
+  networking.hostName = "hedgedoc";
-    hostName = "hedgedoc";
-    hosts = with zentralwerk.lib.config.site.net.serv; {
-      ${hosts6.up4.auth} = [ "auth.c3d2.de" ];
-      ${hosts4.auth} = [ "auth.c3d2.de" ];
-    };
-  };
 
   services = {
     hedgedoc = {
@@ -75,19 +69,19 @@
       };
     };
 
+    portunus.addToHosts = true;
+
     postgresql = {
       enable = true;
       ensureDatabases = [
         "hedgedoc"
       ];
-      ensureUsers = [
+      ensureUsers = [ {
-        {
+        name = "hedgedoc";
-          name = "hedgedoc";
+        ensurePermissions = {
-          ensurePermissions = {
+          "DATABASE \"hedgedoc\"" = "ALL PRIVILEGES";
-            "DATABASE \"hedgedoc\"" = "ALL PRIVILEGES";
+        };
-          };
+      }];
-        }
-      ];
       package = pkgs.postgresql_14;
     };
   };

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 = {

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;

hosts/mastodon/default.nix

@@ -7,13 +7,7 @@
     needForSpeed = true;
   };
 
-  networking = {
+  networking.hostName = "mastodon";
-    hostName = "mastodon";
-    hosts = with zentralwerk.lib.config.site.net.serv; {
-      ${hosts6.up4.auth} = [ "auth.c3d2.de" ];
-      ${hosts4.auth} = [ "auth.c3d2.de" ];
-    };
-  };
 
   nixpkgs.config.allowUnfreePredicate = pkg: lib.getName pkg == "elasticsearch";
 
@@ -152,6 +146,8 @@
       "social.c3d2.de"
     ];
 
+    portunus.addToHosts = true;
+
     postgresql = {
       enable = true;
       ensureUsers = [{