massive style guide fixups

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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 76cfe3c6e7c4b3df68e002def746e8a1fa225cbc..1dd571137d28311a11ef93c83a627a896eec092d 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -1,75 +1,47 @@
 class named::geodns inherits named {
-    activate_munin_check {
-        "bind_views": script => bind;
-    }
+       munin::check { 'bind_views':
+               script => bind
+       }
 
-    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:///modules/named/per-host/$fqdn/named.conf.local",
-                         "puppet:///modules/named/common/named.conf.local" ],
-            require => Package["bind9"],
-            notify  => Exec["bind9 restart"],
-            owner   => root,
-            group   => root,
-            ;
-        "/etc/bind/named.conf.acl":
-            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.acl",
-                         "puppet:///modules/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:///modules/named/per-host/$fqdn/named.conf.geo",
-                         "puppet:///modules/named/common/named.conf.geo" ],
-            require => Package["bind9"],
-            notify  => Exec["bind9 restart"],
-            owner   => root,
-            group   => root,
-            ;
-        "/etc/bind/geodns/trigger":
-            source  => [ "puppet:///modules/named/per-host/$fqdn/trigger",
-                         "puppet:///modules/named/common/trigger" ],
-            owner   => root,
-            group   => root,
-            mode    => 555,
-            ;
-        "/etc/ssh/userkeys/geodnssync":
-            source  => [ "puppet:///modules/named/per-host/$fqdn/authorized_keys",
-                         "puppet:///modules/named/common/authorized_keys" ],
-            owner   => root,
-            group   => geodnssync,
-            mode    => 440,
-            ;
-        "/etc/cron.d/dsa-boot-geodnssync":
-            source  => [ "puppet:///modules/named/per-host/$fqdn/cron-geo",
-                         "puppet:///modules/named/common/cron-geo" ],
-            owner   => root,
-            group   => root,
-            ;
-    }
-}
+       site::aptrepo { 'geoip':
+               template => 'debian-org/etc/apt/sources.list.d/geoip.list.erb',
+       }
 
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+       file { '/etc/bind/':
+               ensure  => directory,
+               require => Package['bind9'],
+               notify  => Service['bind9'],
+       }
+       file { '/etc/bind/geodns':
+               ensure => directory,
+       }
+       file { '/etc/bind/named.conf.options':
+               content => template('named/named.conf.options.erb'),
+       }
+       file { '/etc/bind/named.conf.local':
+               source => 'puppet:///modules/named/common/named.conf.local',
+       }
+       file { '/etc/bind/named.conf.acl':
+               source => 'puppet:///modules/named/common/named.conf.acl',
+       }
+       file { '/etc/bind/geodns/zonefiles':
+               ensure => directory,
+               owner  => geodnssync,
+               group  => geodnssync,
+               mode   => '0755',
+       }
+       file { '/etc/bind/geodns/named.conf.geo':
+               source => 'puppet:///modules/named/common/named.conf.geo',
+       }
+       file { '/etc/bind/geodns/trigger':
+               source => 'puppet:///modules/named/common/trigger',
+       }
+       file { '/etc/ssh/userkeys/geodnssync':
+               source => 'puppet:///modules/named/common/authorized_keys',
+               group  => geodnssync,
+               mode   => '0440',
+       }
+       file { '/etc/cron.d/dsa-boot-geodnssync':
+               source => 'puppet:///modules/named/common/cron-geo'
+       }
+}