X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=b12ed7f9b61d526de866d373ae4e27eaca68469f;hb=29cbe59430d1e7d7d5575579b48513c56227e2f7;hp=55039191cb84b8284fb231854b5fc48382ad96b4;hpb=70ba4087483d139cc849b67dc19d8899ccfb529a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 55039191c..b12ed7f9b 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -1,77 +1,63 @@
 class named::geodns inherits named {
-        activate_munin_check {
-                "bind_views": script => bind;
-        }
+	munin::check { 'bind_views':
+		script => bind
+	}
 
-        file {
-                "/tmp/test":
-                        content => template("named/class-test.erb")
-                        ;
-                "/etc/apt/sources.list.d/geoip.list":
-                        content => template("debian-org/etc/apt/sources.list.d/geoip.list.erb"),
-                        notify  => Exec["apt-get update"],
-                        ;
-                "/etc/bind/named.conf.local":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.local",
-                                     "puppet:///named/common/named.conf.local" ],
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
-                "/etc/bind/named.conf.acl":
-                        content => template("named/named.conf.acl.erb"),
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
-                "/etc/bind/named.conf.options":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.options",
-                                     "puppet:///named/common/named.conf.options" ],
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
+	package { 'geoip-database':
+		ensure => installed,
+	}
 
-                "/etc/bind/geodns":
-                        ensure  => directory,
-                        owner   => root,
-                        group   => geodnssync,
-                        mode    => 775,
-                        ;
-                "/etc/bind/geodns/named.conf.geo":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
-                                     "puppet:///named/common/named.conf.geo" ],
-                        require => Package["bind9"],
-                        notify  => Exec["bind9 restart"],
-                        owner   => root,
-                        group   => root,
-                        ;
-                "/etc/bind/geodns/recvconf":
-                        source  => [ "puppet:///named/per-host/$fqdn/recvconf",
-                                     "puppet:///named/common/recvconf" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 555,
-                        ;
-                "/etc/bind/geodns/recvconf.files":
-                        source  => [ "puppet:///named/per-host/$fqdn/recvconf.files",
-                                     "puppet:///named/common/recvconf.files" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 444,
-                        ;
+	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.local':
+		source => 'puppet:///modules/named/common/named.conf.local',
+		notify  => Service['bind9'],
+	}
+        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,
+		owner  => geodnssync,
+		group  => geodnssync,
+		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/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
+	}
 
-                "/etc/ssh/userkeys/geodnssync":
-                        source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
-                                     "puppet:///named/common/authorized_keys" ],
-                        owner   => root,
-                        group   => geodnssync,
-                        mode    => 440,
-                        ;
-        }
+	ferm::rule { '01-dsa-bind':
+		domain      => '(ip ip6)',
+		description => 'Allow nameserver access',
+		rule        => '&TCP_UDP_SERVICE(53)'
+	}
 }
-
-# vim: set fdm=marker ts=8 sw=8 et: