X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=ef2fa14ccb31b353f586a0aa3674a8be30bc9b3b;hb=2835c1daf1a5f55ec56366fa5d534b6bfc7728cb;hp=f8be4859a3922df235200bec70f287b8b92fb470;hpb=44688b3127634f8a9369c6419f45a706a39ee628;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index f8be4859a..ef2fa14cc 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -7,13 +7,6 @@ class named::geodns inherits named {
 		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,
@@ -25,10 +18,6 @@ class named::geodns inherits named {
 		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'],
@@ -58,16 +47,17 @@ class named::geodns inherits named {
 		mode   => '0555',
 		source => 'puppet:///modules/named/common/trigger',
 	}
-	file { '/etc/ssh/userkeys/geodnssync':
-		source => 'puppet:///modules/named/common/authorized_keys',
-		group  => geodnssync,
-		mode   => '0440',
-	}
 	file { '/etc/cron.d/dsa-boot-geodnssync': ensure => absent; }
-	concat::fragment { 'dsa-puppet-stuff--geodns-boot':
-		target => '/etc/cron.d/dsa-puppet-stuff',
+	concat::fragment { 'puppet-crontab--geodns-boot':
+		target => '/etc/cron.d/puppet-crontab',
 		content  => @(EOF)
 			@reboot geodnssync sleep 1m && /etc/bind/geodns/trigger > /dev/null
 			| EOF
 	}
+
+	ferm::rule { '01-dsa-bind':
+		domain      => '(ip ip6)',
+		description => 'Allow nameserver access',
+		rule        => '&TCP_UDP_SERVICE(53)'
+	}
 }