X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Fmanifests%2Finit.pp;h=21e65da67819c255c87148ac2d464585d0ca0269;hb=8f359d52bbf98e4b69c408e72aa26407ecbfc6bb;hp=08b400f5172771d6613976aec6325ab8cdced427;hpb=aba2dd60d755b8d73ef2ab1a2d35a378335ecd90;p=mirror%2Fdsa-puppet.git diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp index 08b400f51..21e65da67 100644 --- a/modules/puppetmaster/manifests/init.pp +++ b/modules/puppetmaster/manifests/init.pp @@ -27,11 +27,13 @@ class puppetmaster { } Concat::Fragment <<| tag == "onionbalance-services.yaml" |>> - file { '/etc/cron.d/puppet-update-fastly-ips': - source => 'puppet:///modules/puppetmaster/update-fastly-ips.cron' - } - file { '/etc/cron.d/update-fastly-ips': - ensure => absent, + file { '/etc/cron.d/puppet-update-fastly-ips': 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',