Move crontab geodns boot into dsa-puppet-stuff

diff --git a/modules/named/files/common/cron-geo b/modules/named/files/common/cron-geo
deleted file mode 100644 (file)
index 5e263a1..0000000
--- a/modules/named/files/common/cron-geo
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-# USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-#
-
-@reboot geodnssync sleep 1m && /etc/bind/geodns/trigger > /dev/null

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index 2466193..7b6324c 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -64,6 +64,12 @@ class named::geodns inherits named {
                mode   => '0440',
        }
        file { '/etc/cron.d/dsa-boot-geodnssync':
-               source => 'puppet:///modules/named/common/cron-geo'
+               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
        }
 }