From affb69250d13f64d2be14327c1b47d23cadcb987 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 17 Apr 2016 04:13:32 +0200 Subject: krebs.backup network-ssh-port: fail if cannot find port --- krebs/3modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index be530d46..10c61b63 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -218,7 +218,7 @@ let (filter (hasSuffix ".${cfg.search-domain}") longs); add-port = a: - if net.ssh.port != null + if net.ssh.port != 22 then "[${a}]:${toString net.ssh.port}" else a; in -- cgit v1.2.3 From f5f7abce0d343c20a35bb12c49d03c5bf544d8a9 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 17 Apr 2016 10:23:01 +0200 Subject: krebs: programs.ssh.extraConfig += Host ... Port ... --- krebs/3modules/default.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 10c61b63..9dac50d5 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -228,8 +228,25 @@ let publicKey = host.ssh.pubkey; }) (filterAttrs (_: host: host.ssh.pubkey != null) cfg.hosts); + + programs.ssh.extraConfig = concatMapStrings + (net: '' + Host ${toString (net.aliases ++ net.addrs)} + Port ${toString net.ssh.port} + '') + (filter + (net: net.ssh.port != 22) + (concatMap (host: attrValues host.nets) + (mapAttrsToList + (_: host: recursiveUpdate host + (optionalAttrs (hasAttr config.krebs.search-domain host.nets) { + nets."" = host.nets.${config.krebs.search-domain} // { + aliases = [host.name]; + addrs = []; + }; + })) + config.krebs.hosts))); } ]; -in -out +in out -- cgit v1.2.3 From 96301634b906182be0d8a5d669481da309f4a17a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 27 Apr 2016 01:10:25 +0200 Subject: services.exim -> krebs.exim --- krebs/3modules/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 9dac50d5..e87b3360 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -13,6 +13,7 @@ let ./buildbot/slave.nix ./build.nix ./current.nix + ./exim.nix ./exim-retiolum.nix ./exim-smarthost.nix ./fetchWallpaper.nix -- cgit v1.2.3 From 289231f1974c6ce4b6794060bc6b80d236b3e4fc Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 19 May 2016 15:05:16 +0200 Subject: exim-smarthost: add eloop2016 ML --- krebs/3modules/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index e87b3360..cbd6975a 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -158,7 +158,10 @@ let makefu tv ]; + ciko.mail = "ciko@shackspace.de"; + Mic92.mail = "joerg@higgsboson.tk"; in { + "eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ]; "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; "makefu@krebsco.de" = makefu; -- cgit v1.2.3 From c40ff531b4b63ff76b37be19c11d754277dfb6ed Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 19 May 2016 15:18:26 +0200 Subject: exim-smarthost: cfp@eloop.org -> eloop2016 ML --- krebs/3modules/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index cbd6975a..1c56bfbf 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -161,6 +161,7 @@ let ciko.mail = "ciko@shackspace.de"; Mic92.mail = "joerg@higgsboson.tk"; in { + "cfp@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; "eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ]; "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; -- cgit v1.2.3 From ee0c30cbe5a5614e7f5f2e6edc13fb0c7c434ad4 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 19 May 2016 15:43:06 +0200 Subject: exim-smarthost: update ciko's mail --- krebs/3modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 1c56bfbf..2f3c2090 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -158,7 +158,7 @@ let makefu tv ]; - ciko.mail = "ciko@shackspace.de"; + ciko.mail = "wieczorek.stefan@gmail.com"; Mic92.mail = "joerg@higgsboson.tk"; in { "cfp@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; -- cgit v1.2.3 From 1e9199f93920d794789c8585b7cb196372f4864e Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 21 May 2016 09:28:50 +0200 Subject: krebs internet-aliases: *@eloop.org -> eloop2016@krebsco.de --- krebs/3modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/3modules/default.nix') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 2f3c2090..c114b74d 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -161,7 +161,7 @@ let ciko.mail = "wieczorek.stefan@gmail.com"; Mic92.mail = "joerg@higgsboson.tk"; in { - "cfp@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; + "*@eloop.org" = [{ mail = "eloop2016@krebsco.de"; }]; "eloop2016@krebsco.de" = spam-ml ++ [ ciko Mic92 ]; "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; -- cgit v1.2.3