summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-10-24 10:07:00 +0200
committertv <tv@shackspace.de>2015-10-24 10:07:00 +0200
commit3dcc050cd9a923983305dab568445d2267b4dbef (patch)
tree26ba2f570c6b7d97b8b3b78632515c48e2c4e872
parent93dcfe5ad61903f90f422d9d6c97e499b240aa86 (diff)
parent584213070350a86423e53dce5a8b0e0bc7c0fa8c (diff)
Merge remote-tracking branches 'mors/master' and 'pnp/master'
-rw-r--r--krebs/3modules/makefu/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 4f8f964f8..d328033cc 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -91,7 +91,8 @@ with lib;
extraZones = {
"krebsco.de" = ''
mediengewitter IN A ${head nets.internet.addrs4}
- flap IN A ${head nets.internet.addrs4}'';
+ flap IN A ${head nets.internet.addrs4}
+ '';
};
nets = {
internet = {
@@ -125,11 +126,11 @@ with lib;
extraZones = {
"krebsco.de" = ''
- IN MX 10 mx42
euer IN MX 1 aspmx.l.google.com.
pigstarter IN A ${head nets.internet.addrs4}
gold IN A ${head nets.internet.addrs4}
- boot IN A ${head nets.internet.addrs4}'';
+ boot IN A ${head nets.internet.addrs4}
+ '';
};
nets = {
internet = {
@@ -168,7 +169,7 @@ with lib;
graphs IN A ${head nets.internet.addrs4}
paste 60 IN A ${head nets.internet.addrs4}
tinc IN A ${head nets.internet.addrs4}
- '';
+ '';
};
nets = rec {
internet = {
@@ -214,7 +215,8 @@ 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} '';
+ gum IN A ${head nets.internet.addrs4}
+ '';
};
nets = {
internet = {