Merge remote-tracking branches 'mors/master' and 'pnp/master'

This commit is contained in:
tv 2015-10-24 10:07:00 +02:00
commit 3dcc050cd9
1 changed files with 7 additions and 5 deletions

View File

@ -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 = {