diff options
author | makefu <github@syntax-fehler.de> | 2015-09-27 15:27:00 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-09-27 15:27:00 +0200 |
commit | 400dab8254aa175213df8f6bd5ed391d80c7d827 (patch) | |
tree | bcd035856f0a8da4a80cbbaa897f2605f57e11f8 /tv/2configs | |
parent | 394408c9b715a2dfb6aba560c4db71b78cf46f8d (diff) | |
parent | 95f1673f1f50384682815effa675e5ef5c68847e (diff) |
Merge remote-tracking branch 'cd/master' into before-merge
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/base.nix | 3 | ||||
-rw-r--r-- | tv/2configs/charybdis.nix | 4 | ||||
-rw-r--r-- | tv/2configs/exim-smarthost.nix | 55 | ||||
-rw-r--r-- | tv/2configs/git.nix | 4 |
4 files changed, 62 insertions, 4 deletions
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 89a66115..1c6eba66 100644 --- a/tv/2configs/base.nix +++ b/tv/2configs/base.nix @@ -15,9 +15,10 @@ in imports = [ { + # TODO never put hashedPassword into the store users.extraUsers = mapAttrs (_: h: { hashedPassword = h; }) - (import /root/src/secrets/hashedPasswords.nix); + (import <secrets/hashedPasswords.nix>); } { users.defaultUserShell = "/run/current-system/sw/bin/bash"; diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix index a949026d..80c6f7c4 100644 --- a/tv/2configs/charybdis.nix +++ b/tv/2configs/charybdis.nix @@ -21,7 +21,7 @@ let }; dhParams = mkOption { type = types.str; - default = "/root/src/secrets/charybdis.dh.pem"; + default = toString <secrets/charybdis.dh.pem>; }; motd = mkOption { type = types.str; @@ -32,7 +32,7 @@ let }; sslKey = mkOption { type = types.str; - default = "/root/src/secrets/charybdis.key.pem"; + default = toString <secrets/charybdis.key.pem>; }; }; diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix new file mode 100644 index 00000000..811c8e4c --- /dev/null +++ b/tv/2configs/exim-smarthost.nix @@ -0,0 +1,55 @@ +{ config, pkgs, ... }: + +{ + krebs.exim-smarthost = { + enable = true; + primary_hostname = "${config.networking.hostName}.retiolum"; + sender_domains = [ + "shackspace.de" + "viljetic.de" + ]; + relay_from_hosts = [ + "10.243.13.37" + ]; + 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.mail; } + + { from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; } + + { from = "mirko@viljetic.de"; to = mv.mail; } + + # TODO killme (wo wird die benutzt?) + { from = "tv@cd.retiolum"; to = tv.mail; } + + # TODO lists@smtp.retiolum [consul] + { from = "postmaster@krebsco.de"; to = tv.mail; } + + { from = "spam@krebsco.de"; + to = pkgs.lib.concatStringsSep "," [ + tv.mail + "lass@mors.retiolum" + makefu.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 = "tv"; } + { from = "mirko"; to = "mv"; } + ]; + }; +} diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 264cb4a1..5f5fae48 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -26,6 +26,7 @@ let cgserver = {}; crude-mail-setup = {}; dot-xmonad = {}; + get = {}; hack = {}; load-env = {}; make-snapshot = {}; @@ -50,7 +51,8 @@ let collaborators = with config.krebs.users; [ lass makefu ]; }; } // - import /root/src/secrets/repos.nix { inherit config lib pkgs; } + # TODO don't put secrets/repos.nix into the store + import <secrets/repos.nix> { inherit config lib pkgs; } ); make-public-repo = name: { desc ? null, ... }: { |