[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r360: Convert update scripts from cron.daily to real cron entries.
Jeff Licquia
licquia at linuxfoundation.org
Fri Nov 9 15:18:52 UTC 2012
------------------------------------------------------------
revno: 360
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Fri 2012-11-09 10:18:52 -0500
message:
Convert update scripts from cron.daily to real cron entries.
modified:
modules/apachehttpd/manifests/betaspecs.pp
modules/ftp/manifests/init.pp
-------------- next part --------------
=== modified file 'modules/apachehttpd/manifests/betaspecs.pp'
--- a/modules/apachehttpd/manifests/betaspecs.pp 2012-02-08 07:27:16 +0000
+++ b/modules/apachehttpd/manifests/betaspecs.pp 2012-11-09 15:18:52 +0000
@@ -10,6 +10,10 @@
}
file { '/etc/cron.daily/update-betaspecs':
+ ensure => absent,
+ }
+
+ file { '/usr/local/bin/update-betaspecs':
source => [ "puppet:///modules/apachehttpd/update-betaspecs" ],
notify => Exec['do-update-betaspecs'],
mode => 0755,
@@ -54,11 +58,18 @@
}
exec { 'do-update-betaspecs':
- command => '/etc/cron.daily/update-betaspecs',
+ command => '/usr/local/bin/update-betaspecs',
path => [ '/usr/sbin', '/usr/bin', '/bin' ],
timeout => 600,
refreshonly => true,
logoutput => on_failure,
}
+ cron { 'regular-update-betaspecs':
+ command => '/usr/local/bin/update-betaspecs',
+ user => root,
+ hour => 3,
+ minute => 0,
+ }
+
}
=== modified file 'modules/ftp/manifests/init.pp'
--- a/modules/ftp/manifests/init.pp 2012-03-21 19:47:17 +0000
+++ b/modules/ftp/manifests/init.pp 2012-11-09 15:18:52 +0000
@@ -25,10 +25,16 @@
# Scripts for updating information on the FTP server.
- file { '/etc/cron.daily/update-manifests':
+ file {
+ '/etc/cron.daily/update-manifests': ensure => absent;
+ '/etc/cron.daily/update-problem-db2': ensure => absent;
+ }
+
+ file { '/usr/local/bin/update-manifests':
source => [ "puppet:///modules/ftp/cron/update-manifests/$fqdn",
"puppet:///modules/ftp/cron/update-manifests/default" ],
mode => 0755,
+ notify => Exec['do-update-manifests'],
}
file { '/opt/ftp-maint/manifest/manifest_rebuild_s.sh':
@@ -36,12 +42,44 @@
mode => 0755,
group => 'users',
owner => 'lfadmin',
+ notify => Exec['do-update-manifests'],
}
- file { '/etc/cron.daily/update-problem-db2':
+ file { '/usr/local/bin/update-problem-db2':
source => [ "puppet:///modules/ftp/cron/update-problem-db2/$fqdn",
"puppet:///modules/ftp/cron/update-problem-db2/default" ],
mode => 0755,
+ notify => Exec['do-update-problem-db2'],
+ }
+
+ exec { 'do-update-manifests':
+ command => '/usr/local/bin/update-manifests',
+ path => [ '/usr/sbin', '/usr/bin', '/bin' ],
+ timeout => 600,
+ refreshonly => true,
+ logoutput => on_failure,
+ }
+
+ cron { 'regular-update-manifests':
+ command => '/usr/local/bin/update-manifests',
+ user => root,
+ hour => 3,
+ minute => 15,
+ }
+
+ exec { 'do-update-problem-db2':
+ command => '/usr/local/bin/update-problem-db2',
+ path => [ '/usr/sbin', '/usr/bin', '/bin' ],
+ timeout => 600,
+ refreshonly => true,
+ logoutput => on_failure,
+ }
+
+ cron { 'regular-update-problem-db2':
+ command => '/usr/local/bin/update-problem-db2',
+ user => root,
+ hour => 3,
+ minute => 30,
}
}
More information about the lsb-messages
mailing list