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:
  ignore /etc/bind as well
  Make bind write to a subdirectory of /var/log

diff --git a/modules/geodns/files/common/named.conf.options b/modules/geodns/files/common/named.conf.options
index aa59344..1a87200 100644 (file)
--- a/modules/geodns/files/common/named.conf.options
+++ b/modules/geodns/files/common/named.conf.options
@@ -30,7 +30,7 @@ options {
 logging {
 
        channel queries {
-               file "/var/log/geoip-query.log" versions 4 size 40m;
+               file "/var/log/bind9/geoip-query.log" versions 4 size 40m;
                print-time yes;
                print-category yes;
        };

diff --git a/modules/geodns/manifests/init.pp b/modules/geodns/manifests/init.pp
index d55d85c..5e4feaf 100644 (file)
--- a/modules/geodns/manifests/init.pp
+++ b/modules/geodns/manifests/init.pp
@@ -78,6 +78,12 @@ class geodns {
                         group   => geodnssync,
                         mode    => 440,
                         ;
+                "/var/log/bind9":
+                        ensure  => directory,
+                        owner   => bind,
+                        group   => bind,
+                        mode    => 775,
+                        ;
         }
 
         exec {

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 6fc23ce..a00b61e 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -90,6 +90,7 @@ file=/var/state/samhain/samhain_file
 file=/etc/bind/zones/db.debian.net
 file=/etc/exim4/bsmtp
 <% if hostname == "geo1" || hostname == "geo2" || hostname == "geo3" -%>
+file=/etc/bind
 file=/etc/bind/named.conf.acl
 file=/etc/bind/named.conf.options
 file=/etc/bind/named.conf.local