From a6816eaad40f5f6e84e30d2dd5a6bd20c6b1cebf Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 25 Dec 2017 12:01:00 +0100 Subject: [PATCH 1/1] move cron.d/puppet-update-fastly-ips into dsa-puppet-stuff --- modules/puppetmaster/files/update-fastly-ips.cron | 2 -- modules/puppetmaster/manifests/init.pp | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 modules/puppetmaster/files/update-fastly-ips.cron diff --git a/modules/puppetmaster/files/update-fastly-ips.cron b/modules/puppetmaster/files/update-fastly-ips.cron deleted file mode 100644 index 4c8db13d3..000000000 --- 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 08b400f51..d0e281e5d 100644 --- 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', -- 2.20.1