X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=7b6324c1bffd27a13f7d2d049584d362c82c6ec1;hb=e4d38fd267b7b5aa6943e2d14c9dfb2bab96a206;hp=7e3ac019ac561224d49cb74ef766147cb040236c;hpb=5f7e9b2a528a64883641f38558c028ae4b1967f0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 7e3ac019a..7b6324c1b 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -3,10 +3,17 @@ class named::geodns inherits named {
 		script => bind
 	}
 
-	site::aptrepo { 'geoip':
-		content => 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,
@@ -20,12 +27,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,
@@ -35,6 +52,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',
@@ -46,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
 	}
 }