X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=a0c6d12025e3537e59c8b7310d7b094da94f2b77;hb=7078770bf6bf50fecb8dac96388fbecaa93a8e9f;hp=b12593dac8b139cc42c0ae36197ef2a329ecf7fe;hpb=97b80c63870174dd9ca6e92b04da0f110a8150b3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index b12593dac..a0c6d1202 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':
-		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,15 @@ 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',
+		notify  => Service['bind9'],
 	}
 	file { '/etc/bind/geodns/zonefiles':
 		ensure => directory,
@@ -35,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',