projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move cron.d/puppet-update-fastly-ips into dsa-puppet-stuff
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
manifests
/
init.pp
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':
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,
}
}
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',
file { '/usr/local/bin/update-fastly-ips':
source => 'puppet:///modules/puppetmaster/update-fastly-ips.sh',
mode => '0555',