some whitespace cleanup and move template to base class

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index ad2ed67..098b112 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -1,74 +1,65 @@
 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":
-                        content => template("named/named.conf.options.erb"),
-                        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,
-                        ;
-        }
+    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/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,
+            ;
+    }
 }
 
 # vim:set et:

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 1a22154..050fb75 100644 (file)
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,37 +1,38 @@
 class named {
-        activate_munin_check {
-                "bind":;
-        }
+    activate_munin_check {
+        "bind":;
+    }
 
-        package {
-                bind9: ensure => installed;
-        }
+    package {
+        bind9: ensure => installed;
+    }
 
-        exec {
-                "bind9 restart":
-                        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-                        refreshonly => true,
-                        ;
-        }
-        exec {
-                "bind9 reload":
-                        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-                        refreshonly => true,
-                        ;
-        }
-        file {
-                "/var/log/bind9":
-                        ensure  => directory,
-                        owner   => bind,
-                        group   => bind,
-                        mode    => 775,
-                        ;
-        }
-        @ferm::rule { "dsa-bind":
-                domain          => "(ip ip6)",
-                description     => "Allow nameserver access",
-                rule            => "&TCP_UDP_SERVICE(53)"
-        }
+    exec {
+        "bind9 restart":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true,
+            ;
+        "bind9 reload":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true,
+            ;
+    }
+    file {
+        "/var/log/bind9":
+            ensure  => directory,
+            owner   => bind,
+            group   => bind,
+            mode    => 775,
+            ;
+        "/etc/bind/named.conf.options":
+            content => template("named/named.conf.options.erb"),
+            notify  => Exec["bind9 reload"],
+    }
+    @ferm::rule { "dsa-bind":
+        domain          => "(ip ip6)",
+        description     => "Allow nameserver access",
+        rule            => "&TCP_UDP_SERVICE(53)"
+    }
 }
 
 # vim:set et:

diff --git a/modules/named/manifests/recursor.pp b/modules/named/manifests/recursor.pp
index 2fc192a..fda2de3 100644 (file)
--- a/modules/named/manifests/recursor.pp
+++ b/modules/named/manifests/recursor.pp
@@ -1,8 +1,4 @@
 class named::recursor inherits named {
-    file { "/etc/bind/named.conf.options":
-        content => template("named/named.conf.options.erb"),
-        notify  => Exec["bind9 reload"],
-    }
 }
 
 

diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp
index 582fbea..4f92c5b 100644 (file)
--- a/modules/named/manifests/secondary.pp
+++ b/modules/named/manifests/secondary.pp
@@ -4,10 +4,6 @@ class named::secondary inherits named {
                      "puppet:///named/common/named.conf.debian-zones" ],
         notify  => Exec["bind9 reload"],
     }
-    file { "/etc/bind/named.conf.options":
-        content => template("named/named.conf.options.erb"),
-        notify  => Exec["bind9 reload"],
-    }
     file { "/etc/bind/named.conf.shared-keys":
         mode    => 640,
         owner   => root,