X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fgeodns.pp;h=0a788231509f1da682fcf90faa8c49abc0d95d27;hb=8a213c951f2ad1ee3e030b39039fc25cc7fc72f7;hp=0ca7b9d8c2acb83b6270535adaada2175d171c56;hpb=5ac8ff2214288d50b7ddef3915650d6c9e65c89b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 0ca7b9d8c..0a7882315 100644
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -1,85 +1,58 @@
 class named::geodns inherits named {
-        file {
-                "/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":
-                        source  => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
-                                     "puppet:///named/common/named.conf.acl" ],
-                        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,
-                        ;
+	munin::check { 'bind_views':
+		script => bind
+	}
 
-                "/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,
-                        ;
+	#site::aptrepo { 'geoip':
+	#	url        => 'http://db.debian.org/debian-admin',
+	#	suite      => 'lenny-bind-geoip',
+	#	components => 'main',
+	#}
+	site::aptrepo { 'geoip': ensure => absent }
 
-                "/usr/share/GeoIP/GeoIPv6.dat":
-                        source  => [ "puppet:///named/per-host/$fqdn/GeoIPv6.dat",
-                                     "puppet:///named/common/GeoIPv6.dat" ],
-                        owner   => root,
-                        group   => root,
-                        mode    => 444,
-                        ;
-
-                "/etc/ssh/userkeys/geodnssync":
-                        source  => [ "puppet:///named/per-host/$fqdn/authorized_keys",
-                                     "puppet:///named/common/authorized_keys" ],
-                        owner   => root,
-                        group   => geodnssync,
-                        mode    => 440,
-                        ;
-                "/var/log/bind9":
-                        ensure  => directory,
-                        owner   => bind,
-                        group   => bind,
-                        mode    => 775,
-                        ;
-        }
+	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   => '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':
+		source => 'puppet:///modules/named/common/authorized_keys',
+		group  => geodnssync,
+		mode   => '0440',
+	}
+	file { '/etc/cron.d/dsa-boot-geodnssync':
+		source => 'puppet:///modules/named/common/cron-geo'
+	}
 }
-
-# vim: set fdm=marker ts=8 sw=8 et: