Move crontab geodns boot into dsa-puppet-stuff

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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 1dd5711..7b6324c 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -3,37 +3,59 @@ class named::geodns inherits named {
                script => bind
        }
 
-       site::aptrepo { 'geoip':
-               template => 'debian-org/etc/apt/sources.list.d/geoip.list.erb',
+       package { 'geoip-database':
+               ensure => installed,
        }
 
+       #site::aptrepo { 'geoip':
+       #       url        => 'http://db.debian.org/debian-admin',
+       #       suite      => 'lenny-bind-geoip',
+       #       components => 'main',
+       #}
+       site::aptrepo { 'geoip': ensure => absent }
+
        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'),
+               notify  => Service['bind9'],
        }
        file { '/etc/bind/named.conf.local':
                source => 'puppet:///modules/named/common/named.conf.local',
+               notify  => Service['bind9'],
        }
-       file { '/etc/bind/named.conf.acl':
-               source => 'puppet:///modules/named/common/named.conf.acl',
+        if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+               file { '/etc/bind/named.conf.acl':
+                       source => 'puppet:///modules/named/common/named.conf.acl',
+                       notify  => Service['bind9'],
+               }
+       } else {
+               file { '/etc/bind/named.conf.acl':
+                       source => 'puppet:///modules/named/common/named.conf.acl.bind99',
+                       notify  => Service['bind9'],
+               }
        }
        file { '/etc/bind/geodns/zonefiles':
                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',
+               notify  => Service['bind9'],
        }
        file { '/etc/bind/geodns/trigger':
+               mode   => '0555',
                source => 'puppet:///modules/named/common/trigger',
        }
        file { '/etc/ssh/userkeys/geodnssync':
@@ -42,6 +64,12 @@ class named::geodns inherits named {
                mode   => '0440',
        }
        file { '/etc/cron.d/dsa-boot-geodnssync':
-               source => 'puppet:///modules/named/common/cron-geo'
+               ensure => absent;
+       }
+       concat::fragment { 'dsa-puppet-stuff--geodns-boot':
+               target => '/etc/cron.d/dsa-puppet-stuff',
+               content  => @(EOF)
+                       @reboot geodnssync sleep 1m && /etc/bind/geodns/trigger > /dev/null
+                       | EOF
        }
 }