whitespace nazi

[dsa-puppet.git] / modules / named / manifests / geodns.pp

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 851b474d88a7dc467a86830e94d3e84cb51b07f8..ad2ed67d06f989ae880cc9ea526eaa57c1fbc83a 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -17,15 +17,15 @@ class named::geodns inherits named {
                         group   => root,
                         ;
                 "/etc/bind/named.conf.acl":
-                        content => template("named/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" ],
+                        content => template("named/named.conf.options.erb"),
                         require => Package["bind9"],
                         notify  => Exec["bind9 restart"],
                         owner   => root,
@@ -71,4 +71,6 @@ class named::geodns inherits named {
         }
 }
 
-# vim: set fdm=marker ts=8 sw=8 et:
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: