diff options
author | makefu <makefu@tsp> | 2015-08-14 14:00:18 +0000 |
---|---|---|
committer | makefu <makefu@tsp> | 2015-08-14 14:00:18 +0000 |
commit | d35de37b0d2b9d5d567a530726aa01f2ec686bf3 (patch) | |
tree | 8bcccdb27a1c0087668cd9d63bb294e71f4cb79a /krebs/3modules/default.nix | |
parent | c36ea0e029772649e33a727a9be15986cbb1fed2 (diff) | |
parent | b8b2575d8313cfd0696a121cee1b8738faff6638 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/default.nix')
-rw-r--r-- | krebs/3modules/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index d77d00c05..a0d4f0157 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -7,6 +7,7 @@ let out = { imports = [ ./exim-retiolum.nix + ./exim-smarthost.nix ./github-hosts-sync.nix ./git.nix ./nginx.nix @@ -309,9 +310,11 @@ let users = addNames { lass = { pubkey = readFile ../../Zpubkeys/lass.ssh.pub; + mail = "lass@mors.retiolum"; }; uriel = { pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; + mail = "uriel@mors.retiolum"; }; }; }; @@ -455,6 +458,13 @@ let cd = { cores = 2; dc = "tv"; #dc = "cac"; + extraZones = { + "de.krebsco" = '' + mx23 IN A ${elemAt nets.internet.addrs4 0} + cd IN A ${elemAt nets.internet.addrs4 0} + krebsco.de. IN MX 5 mx23 + ''; + }; nets = rec { internet = { addrs4 = ["162.219.7.216"]; |