Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  reverse zone on slaves
  another blacklist entry
  blacklist *@piekmarketing.eu for spam

diff --git a/modules/exim/files/common/blacklist b/modules/exim/files/common/blacklist
index ee536be040a1120eeaf2a1d34b63b172fb259385..d9a016ab90e9befbff2df75e49ec508b1e785200 100644 (file)
--- a/modules/exim/files/common/blacklist
+++ b/modules/exim/files/common/blacklist
@@ -4,3 +4,4 @@
 ##
 
 mailadmin@o2online.de
+*@piekmarketing.eu

diff --git a/modules/exim/files/common/host_blacklist b/modules/exim/files/common/host_blacklist
index 1abd92a754644c744ce6660d866ace358dc1eef1..a59ce8274e302adf66a396bea0ba6362c59a07c5 100644 (file)
--- a/modules/exim/files/common/host_blacklist
+++ b/modules/exim/files/common/host_blacklist
@@ -3,4 +3,5 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 193.146.156.252
+112.78.115.101
 *.bp06.net

diff --git a/modules/named-secondary/files/common/named.conf.debian-zones b/modules/named-secondary/files/common/named.conf.debian-zones
index 2df29d43bc19b52cebe5c917f4531c2d49c3c931..00b74cd3c3d2558631f7eddc839e92d6ca06df4b 100644 (file)
--- a/modules/named-secondary/files/common/named.conf.debian-zones
+++ b/modules/named-secondary/files/common/named.conf.debian-zones
@@ -126,5 +126,18 @@ zone "2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa" {
        allow-query { any; };
        allow-transfer { };
 };
+// ipv6 at schlund - wieck 2001:8d8:2:1:6564:a62::/64
+zone "2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa" {
+       type slave;
+       notify no;
+       file "db.2001:8d8:2:1:6564:a62";
+       masters {
+               82.195.75.106; // draghi
+               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+       };
+       allow-query { any; };
+       allow-transfer { };
+};
+
 
 // vim:set syn=named: