stop using virtual resources for ferm::rule

[mirror/dsa-puppet.git] / modules / named / manifests / geodns.pp

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index b00d727..b12ed7f 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -3,10 +3,8 @@ class named::geodns inherits named {
                script => bind
        }
 
-       site::aptrepo { 'geoip':
-               url        => 'http://db.debian.org/debian-admin',
-               suite      => 'lenny-bind-geoip',
-               components => 'main',
+       package { 'geoip-database':
+               ensure => installed,
        }
 
        file { '/etc/bind/':
@@ -20,14 +18,20 @@ class named::geodns inherits named {
                ensure => directory,
                mode   => '0755',
        }
-       file { '/etc/bind/named.conf.options':
-               content => template('named/named.conf.options.erb'),
-       }
        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',
+        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,
@@ -37,17 +41,23 @@ 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',
                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',
+               content  => @(EOF)
+                       @reboot geodnssync sleep 1m && /etc/bind/geodns/trigger > /dev/null
+                       | EOF
        }
-       file { '/etc/cron.d/dsa-boot-geodnssync':
-               source => 'puppet:///modules/named/common/cron-geo'
+
+       ferm::rule { '01-dsa-bind':
+               domain      => '(ip ip6)',
+               description => 'Allow nameserver access',
+               rule        => '&TCP_UDP_SERVICE(53)'
        }
 }