From 6da220c50848843a4d6e546a8639d0a573bf210b Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 12 Apr 2016 15:16:40 +0200 Subject: l 2: add exim-smarthost configuration --- lass/2configs/exim-smarthost.nix | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 lass/2configs/exim-smarthost.nix (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix new file mode 100644 index 00000000..7f838a31 --- /dev/null +++ b/lass/2configs/exim-smarthost.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +with config.krebs.lib; + +{ + krebs.exim-smarthost = { + enable = true; + #dkim = [ + # { domain = "lassul.us"; } + #]; + sender_domains = [ + "lassul.us" + ]; + relay_from_hosts = map (host: host.nets.retiolum.ip4.addr) [ + config.krebs.hosts.mors + config.krebs.hosts.uriel + config.krebs.hosts.helios + ]; + internet-aliases = with config.krebs.users; [ + { from = "postmaster@lassul.us"; to = lass.mail; } # RFC 822 + { from = "lass@lassul.us"; to = lass.mail; } + { from = "lassulus@lassul.us"; to = lass.mail; } + { from = "test@lassul.us"; to = lass.mail; } + ]; + system-aliases = [ + { from = "mailer-daemon"; to = "postmaster"; } + { from = "postmaster"; to = "root"; } + { from = "nobody"; to = "root"; } + { from = "hostmaster"; to = "root"; } + { from = "usenet"; to = "root"; } + { from = "news"; to = "root"; } + { from = "webmaster"; to = "root"; } + { from = "www"; to = "root"; } + { from = "ftp"; to = "root"; } + { from = "abuse"; to = "root"; } + { from = "noc"; to = "root"; } + { from = "security"; to = "root"; } + { from = "root"; to = "lass"; } + ]; + }; + + krebs.setuid.sendmail = { + filename = "${pkgs.exim}/bin/exim"; + mode = "4111"; + }; + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp --dport smtp"; target = "ACCEPT"; } + ]; +} -- cgit v1.2.3 From 1b717d487791ce6874caa439461d4deeb942a835 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 12 Apr 2016 16:32:58 +0200 Subject: l 2 exim-smarthost: activate DKIM --- lass/2configs/exim-smarthost.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 7f838a31..f1c68241 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -5,9 +5,9 @@ with config.krebs.lib; { krebs.exim-smarthost = { enable = true; - #dkim = [ - # { domain = "lassul.us"; } - #]; + dkim = [ + { domain = "lassul.us"; } + ]; sender_domains = [ "lassul.us" ]; -- cgit v1.2.3 From 40ce314996762fe286a5f8d27873cd0ae9fab145 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 13 Apr 2016 16:29:52 +0200 Subject: l 2 exim-smarthost: add outlook@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index f1c68241..e1aa29c4 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -21,6 +21,7 @@ with config.krebs.lib; { from = "lass@lassul.us"; to = lass.mail; } { from = "lassulus@lassul.us"; to = lass.mail; } { from = "test@lassul.us"; to = lass.mail; } + { from = "outlook@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From 3d7b41fb0bfa8e428bebc58eb42b978d784eed15 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 19 Apr 2016 12:06:50 +0200 Subject: l 2 exim-smarthost: add aidsballs.de mails --- lass/2configs/exim-smarthost.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index e1aa29c4..2efb6f36 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -10,6 +10,7 @@ with config.krebs.lib; ]; sender_domains = [ "lassul.us" + "aidsballs.de" ]; relay_from_hosts = map (host: host.nets.retiolum.ip4.addr) [ config.krebs.hosts.mors @@ -22,6 +23,8 @@ with config.krebs.lib; { from = "lassulus@lassul.us"; to = lass.mail; } { from = "test@lassul.us"; to = lass.mail; } { from = "outlook@lassul.us"; to = lass.mail; } + { from = "steuer@aidsballs.de"; to = lass.mail; } + { from = "lass@aidsballs.de"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From d811a50f7cc7c491a4ed2748161d308c848e3875 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 27 Apr 2016 13:07:32 +0200 Subject: l 2 exim-*: remove redundant setuid code --- lass/2configs/exim-smarthost.nix | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 2efb6f36..384e2236 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -42,11 +42,6 @@ with config.krebs.lib; { from = "root"; to = "lass"; } ]; }; - - krebs.setuid.sendmail = { - filename = "${pkgs.exim}/bin/exim"; - mode = "4111"; - }; krebs.iptables.tables.filter.INPUT.rules = [ { predicate = "-p tcp --dport smtp"; target = "ACCEPT"; } ]; -- cgit v1.2.3 From 3df6f0f98f120c991a18fbe2b906c64bc528366b Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 13 May 2016 00:20:26 +0200 Subject: l 2 exim-smarthost: redir wordpress.ubikmedia.de --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 384e2236..84a57205 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -25,6 +25,7 @@ with config.krebs.lib; { from = "outlook@lassul.us"; to = lass.mail; } { from = "steuer@aidsballs.de"; to = lass.mail; } { from = "lass@aidsballs.de"; to = lass.mail; } + { from = "wordpress@ubikmedia.de"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From 19c850339ad228c1da6e66017e2ab4643a3009d3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 1 Jun 2016 00:11:54 +0200 Subject: l 2 exim-smarthost: add mail for finanzamt --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 84a57205..995f025e 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -26,6 +26,7 @@ with config.krebs.lib; { from = "steuer@aidsballs.de"; to = lass.mail; } { from = "lass@aidsballs.de"; to = lass.mail; } { from = "wordpress@ubikmedia.de"; to = lass.mail; } + { from = "finanzamt@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From 18e602dc707cdd63e02459eb10845bb725763ddc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 1 Jun 2016 00:12:07 +0200 Subject: l 2 exim-smarthost: redirect dominik@apanowicz.de --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/exim-smarthost.nix') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 995f025e..8199f2bd 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -27,6 +27,7 @@ with config.krebs.lib; { from = "lass@aidsballs.de"; to = lass.mail; } { from = "wordpress@ubikmedia.de"; to = lass.mail; } { from = "finanzamt@lassul.us"; to = lass.mail; } + { from = "dominik@apanowicz.de"; to = "dma@ubikmedia.eu"; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3