krebs.users.[mt]v: set mail

6 files changed, 14 insertions, 11 deletions

diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 0b2dab9df..ccb2dd141 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -152,7 +152,7 @@ in
     {
       krebs.urlwatch = {
         enable = true;
-        mailto = "tv@wu.retiolum"; # TODO
+        mailto = config.krebs.users.tv.mail;
         onCalendar = "*-*-* 05:00:00";
         urls = [
           ## nixpkgs maintenance
diff --git a/2configs/tv/base.nix b/2configs/tv/base.nix
index c7d3e0d2a..ab6d24769 100644
--- a/2configs/tv/base.nix
+++ b/2configs/tv/base.nix
@@ -47,7 +47,7 @@ in
     }
     {
       security.sudo.extraConfig = ''
-        Defaults mailto="tv@wu.retiolum"
+        Defaults mailto="${config.krebs.users.tv.mail}"
       '';
       time.timeZone = "Europe/Berlin";
     }
diff --git a/2configs/tv/charybdis.nix b/2configs/tv/charybdis.nix
index 265f85132..d78e162cb 100644
--- a/2configs/tv/charybdis.nix
+++ b/2configs/tv/charybdis.nix
@@ -170,7 +170,7 @@ let
     admin {
       name = "tv";
       description = "peer";
-      email = "tv@wu.retiolum";
+      mail = "${config.krebs.users.tv.mail}";
     };
 
     log {
diff --git a/2configs/tv/exim-smarthost.nix b/2configs/tv/exim-smarthost.nix
index a4c47b399..c93189b8a 100644
--- a/2configs/tv/exim-smarthost.nix
+++ b/2configs/tv/exim-smarthost.nix
@@ -11,20 +11,21 @@ in
     let
       retiolumHostname = "${config.networking.hostName}.retiolum";
 
-      internet-aliases = [
-        { from = "tomislav@viljetic.de"; to = "tv@wu.retiolum"; }
+      internet-aliases = with config.krebs.users; [
+        { from = "tomislav@viljetic.de"; to = tv.mail; }
 
         # (mindestens) lisp-stammtisch und elli haben die:
-        { from = "tv@viljetic.de"; to = "tv@wu.retiolum"; }
+        { from = "tv@viljetic.de"; to = tv.mail; }
 
-        { from = "tv@destroy.dyn.shackspace.de"; to = "tv@wu.retiolum"; }
+        { from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
 
-        { from = "mirko@viljetic.de"; to = "mv@cd.retiolum"; }
+        { from = "mirko@viljetic.de"; to = mv.mail; }
 
         # TODO killme (wo wird die benutzt?)
-        { from = "tv@cd.retiolum"; to = "tv@wu.retiolum"; }
+        { from = "tv@cd.retiolum"; to = tv.mail; }
 
-        { from = "postmaster@krebsco.de"; to = "tv@wu.retiolum"; }
+        # TODO lists@smtp.retiolum [consul]
+        { from = "postmaster@krebsco.de"; to = tv.mail; }
       ];
 
       system-aliases = [
diff --git a/2configs/tv/smartd.nix b/2configs/tv/smartd.nix
index 2e9d955d1..9c4d8b2d8 100644
--- a/2configs/tv/smartd.nix
+++ b/2configs/tv/smartd.nix
@@ -8,7 +8,7 @@
         device = "DEVICESCAN";
         options = toString [
           "-a"
-          "-m tv@wu.retiolum"
+          "-m ${config.krebs.users.tv.mail}"
           "-s (O/../.././09|S/../.././04|L/../../6/05)"
         ];
       }
diff --git a/3modules/krebs/default.nix b/3modules/krebs/default.nix
index 23b3ab7ec..43e7e4c59 100644
--- a/3modules/krebs/default.nix
+++ b/3modules/krebs/default.nix
@@ -309,9 +309,11 @@ let
     };
     users = addNames {
       mv = {
+        mail = "mv@cd.retiolum";
         pubkey = readFile ../../Zpubkeys/mv_vod.ssh.pub;
       };
       tv = {
+        mail = "tv@wu.retiolum";
         pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
       };
     };