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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 1dd571137..a0c6d1202 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -3,37 +3,52 @@ 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',
+		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':