switch weblogsync to other ssh facter

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

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index d9684f3..ef2fa14 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -47,20 +47,15 @@ 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':
+       ferm::rule { '01-dsa-bind':
                domain      => '(ip ip6)',
                description => 'Allow nameserver access',
                rule        => '&TCP_UDP_SERVICE(53)'