X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=3a41b94da87fb5c7b2153f10eddf54fe88d6ef53;hb=12df216f8b140efd052fadb0db74f6c01205d089;hp=191f898efece346ff69e3f58ec937ed73d8aca0e;hpb=a821cd4d512c4cadf3fed26ea808e349748504db;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 191f898ef..3a41b94da 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -1,81 +1,69 @@
 class named::geodns inherits named {
-        activate_munin_check {
-                "bind_views": script => bind;
-        }
+    activate_munin_check {
+        "bind_views": script => bind;
+    }
 
-        file {
-                "/etc/apt/sources.list.d/geoip.list":
-                        content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"),
-                        notify  => Exec["apt-get update"],
-                        ;
-                "/etc/bind/named.conf.local":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
-                                     "puppet:///named/common/named.conf.local" ],
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
-                "/etc/bind/named.conf.acl":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
-                                     "puppet:///named/common/named.conf.acl" ],
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
-                "/etc/bind/named.conf.options":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.options",
-                                     "puppet:///named/common/named.conf.options" ],
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
-
-                "/etc/bind/geodns":
-                        ensure  => directory,
-                        owner   => root,
-                        group   => geodnssync,
-                        mode    => 775,
-                        ;
-                "/etc/bind/geodns/named.conf.geo":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
-                                     "puppet:///named/common/named.conf.geo" ],
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
-                "/etc/bind/geodns/recvconf":
-                        source  => [ "puppet:///named/per-host/$fqdn/recvconf",
-                                     "puppet:///named/common/recvconf" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 555,
-                        ;
-                "/etc/bind/geodns/recvconf.files":
-                        source  => [ "puppet:///named/per-host/$fqdn/recvconf.files",
-                                     "puppet:///named/common/recvconf.files" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 444,
-                        ;
-
-                "/etc/ssh/userkeys/geodnssync":
-                        source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
-                                     "puppet:///named/common/authorized_keys" ],
-                        owner   => root,
-                        group   => geodnssync,
-                        mode    => 440,
-                        ;
-                "/var/log/bind9":
-                        ensure  => directory,
-                        owner   => bind,
-                        group   => bind,
-                        mode    => 775,
-                        ;
-        }
+    file {
+        "/etc/bind/named.conf.options":
+            content => template("named/named.conf.options.erb"),
+            notify  => Exec["bind9 reload"];
+        "/etc/apt/sources.list.d/geoip.list":
+            content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"),
+            notify  => Exec["apt-get update"],
+            ;
+        "/etc/bind/named.conf.local":
+            source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
+                         "puppet:///named/common/named.conf.local" ],
+            require => Package["bind9"],
+            notify  => Exec["bind9 restart"],
+            owner   => root,
+            group   => root,
+            ;
+        "/etc/bind/named.conf.acl":
+            source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
+                         "puppet:///named/common/named.conf.acl" ],
+            require => Package["bind9"],
+            notify  => Exec["bind9 restart"],
+            owner   => root,
+            group   => root,
+            ;
+        "/etc/bind/geodns":
+            ensure  => directory,
+            owner   => root,
+            group   => root,
+            mode    => 755,
+            ;
+        "/etc/bind/geodns/zonefiles":
+            ensure  => directory,
+            owner   => geodnssync,
+            group   => geodnssync,
+            mode    => 755,
+            ;
+        "/etc/bind/geodns/named.conf.geo":
+            source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
+                         "puppet:///named/common/named.conf.geo" ],
+            require => Package["bind9"],
+            notify  => Exec["bind9 restart"],
+            owner   => root,
+            group   => root,
+            ;
+        "/etc/bind/geodns/trigger":
+            source  => [ "puppet:///named/per-host/$fqdn/trigger",
+                         "puppet:///named/common/trigger" ],
+            owner   => root,
+            group   => root,
+            mode    => 555,
+            ;
+        "/etc/ssh/userkeys/geodnssync":
+            source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
+                         "puppet:///named/common/authorized_keys" ],
+            owner   => root,
+            group   => geodnssync,
+            mode    => 440,
+            ;
+    }
 }
 
-# vim: set fdm=marker ts=8 sw=8 et:
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: