move cron.d/puppet-update-fastly-ips into dsa-puppet-stuff

diff --git a/modules/puppetmaster/files/update-fastly-ips.cron b/modules/puppetmaster/files/update-fastly-ips.cron
deleted file mode 100644 (file)
index 4c8db13..0000000
--- a/modules/puppetmaster/files/update-fastly-ips.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-MAILTO=root
-@daily root    /usr/local/bin/update-fastly-ips /srv/puppet.debian.org/puppet-facts/fastly_ranges.yaml

diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index 08b400f..d0e281e 100644 (file)
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -28,11 +28,17 @@ class puppetmaster {
        Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
 
        file { '/etc/cron.d/puppet-update-fastly-ips':
-               source => 'puppet:///modules/puppetmaster/update-fastly-ips.cron'
+               ensure => absent,
        }
        file { '/etc/cron.d/update-fastly-ips':
                ensure => absent,
        }
+       concat::fragment { 'dsa-puppet-stuff---fastly-ips':
+               target => '/etc/cron.d/dsa-puppet-stuff',
+               content  => @(EOF)
+                       @daily  root    /usr/local/bin/update-fastly-ips /srv/puppet.debian.org/puppet-facts/fastly_ranges.yaml
+                       | EOF
+       }
        file { '/usr/local/bin/update-fastly-ips':
                source => 'puppet:///modules/puppetmaster/update-fastly-ips.sh',
                mode   => '0555',