X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=649268a4439371a8bcc0db202bba9a499013259c;hb=d7606746f1a0945f439a6bf1c180719a6779a798;hp=b00d727898a89992112ee3e3da0af9d608939b97;hpb=9573712862a431d238cf67894f4b422794eaa78f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index b00d72789..649268a44 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -3,10 +3,8 @@ class named::geodns inherits named {
 		script => bind
 	}
 
-	site::aptrepo { 'geoip':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'lenny-bind-geoip',
-		components => 'main',
+	package { 'geoip-database':
+		ensure => installed,
 	}
 
 	file { '/etc/bind/':
@@ -22,12 +20,22 @@ class named::geodns inherits named {
 	}
 	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,
@@ -37,6 +45,7 @@ class named::geodns inherits named {
 	}
 	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',
@@ -47,7 +56,11 @@ class named::geodns inherits named {
 		group  => geodnssync,
 		mode   => '0440',
 	}
-	file { '/etc/cron.d/dsa-boot-geodnssync':
-		source => 'puppet:///modules/named/common/cron-geo'
+	file { '/etc/cron.d/dsa-boot-geodnssync': 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
 	}
 }