ferm: change ferm.conf to a template

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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index b12593dac8b139cc42c0ae36197ef2a329ecf7fe..a0c6d12025e3537e59c8b7310d7b094da94f2b77 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -3,10 +3,17 @@ 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,
@@ -20,12 +27,15 @@ class named::geodns inherits named {
        }
        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,
@@ -35,6 +45,7 @@ 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',