diff options
| author | tv <tv@shackspace.de> | 2015-10-22 20:14:01 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-22 20:14:01 +0200 |
| commit | 128e5feae9829ec1c60d16f3d44382435ff1ef86 (patch) | |
| tree | f98601e8408a8f949022d86610828afef6836e0f /krebs/3modules/makefu/default.nix | |
| parent | 9ba8fc142cb14aa3768cb99bf9170f7875beafd1 (diff) | |
| parent | f092e6acb4500569eccee7aed65b521adb3b07b6 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'krebs/3modules/makefu/default.nix')
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 9cf5c9aea..4f8f964f8 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -127,10 +127,8 @@ with lib; "krebsco.de" = '' IN MX 10 mx42 euer IN MX 1 aspmx.l.google.com. - io IN NS pigstarter.krebsco.de. pigstarter IN A ${head nets.internet.addrs4} gold IN A ${head nets.internet.addrs4} - tinc IN A ${head nets.internet.addrs4} boot IN A ${head nets.internet.addrs4}''; }; nets = { @@ -165,8 +163,11 @@ with lib; dc = "makefu"; #dc = "cac"; extraZones = { "krebsco.de" = '' - wry IN A ${head nets.internet.addrs4} - graphs IN A ${head nets.internet.addrs4} + wry IN A ${head nets.internet.addrs4} + io IN NS wry.krebsco.de. + graphs IN A ${head nets.internet.addrs4} + paste 60 IN A ${head nets.internet.addrs4} + tinc IN A ${head nets.internet.addrs4} ''; }; nets = rec { @@ -174,6 +175,7 @@ with lib; addrs4 = ["104.233.87.86"]; aliases = [ "wry.internet" + "paste.internet" ]; }; retiolum = { @@ -182,6 +184,8 @@ with lib; addrs6 = ["42:6e1e:cc8a:7cef:827:f938:8c64:baad"]; aliases = [ "graphs.wry.retiolum" + "paste.wry.retiolum" + "paste.retiolum" "wry.retiolum" ]; tinc.pubkey = '' @@ -210,8 +214,7 @@ with lib; "krebsco.de" = '' omo IN A ${head nets.internet.addrs4} euer IN A ${head nets.internet.addrs4} - gum IN A ${head nets.internet.addrs4} - paste IN A ${head nets.internet.addrs4}''; + gum IN A ${head nets.internet.addrs4} ''; }; nets = { internet = { |