simplify site::aptrepo

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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 1dd571137d28311a11ef93c83a627a896eec092d..7e3ac019ac561224d49cb74ef766147cb040236c 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -4,16 +4,19 @@ class named::geodns inherits named {
        }
 
        site::aptrepo { 'geoip':
-               template => 'debian-org/etc/apt/sources.list.d/geoip.list.erb',
+               content => template('debian-org/etc/apt/sources.list.d/geoip.list.erb'),
        }
 
        file { '/etc/bind/':
                ensure  => directory,
+               group  => bind,
+               mode   => '2755',
                require => Package['bind9'],
                notify  => Service['bind9'],
        }
        file { '/etc/bind/geodns':
                ensure => directory,
+               mode   => '0755',
        }
        file { '/etc/bind/named.conf.options':
                content => template('named/named.conf.options.erb'),
@@ -28,12 +31,13 @@ class named::geodns inherits named {
                ensure => directory,
                owner  => geodnssync,
                group  => geodnssync,
-               mode   => '0755',
+               mode   => '2755',
        }
        file { '/etc/bind/geodns/named.conf.geo':
                source => 'puppet:///modules/named/common/named.conf.geo',
        }
        file { '/etc/bind/geodns/trigger':
+               mode   => '0555',
                source => 'puppet:///modules/named/common/trigger',
        }
        file { '/etc/ssh/userkeys/geodnssync':