Merge pull request #1785 from TutoringAustralasia/devel

Add support for @reboot to cron module
reviewable/pr18780/r1
Michael DeHaan 12 years ago
commit 140d056238

25
cron

@ -98,11 +98,22 @@ options:
required: false required: false
default: "*" default: "*"
aliases: [] aliases: []
reboot:
description:
- If the job should be run at reboot, will ignore minute, hour, day, and month settings in favour of @reboot
required: false
default: False
aliases: []
examples: examples:
- code: 'cron: name="check dirs" hour="5,2" job="ls -alh > /dev/null"' - code: 'cron: name="check dirs" hour="5,2" job="ls -alh > /dev/null"'
description: Ensure a job that runs at 2 and 5 exists. Creates an entry like "* 5,2 * * ls -alh > /dev/null" description: Ensure a job that runs at 2 and 5 exists. Creates an entry like "* 5,2 * * ls -alh > /dev/null"
- code: 'cron: name="an old job" cron job="/some/dir/job.sh" state=absent' - code: 'cron: name="an old job" cron job="/some/dir/job.sh" state=absent'
description: 'Ensure an old job is no longer present. Removes any job that is preceded by "#Ansible: an old job" in the crontab' description: 'Ensure an old job is no longer present. Removes any job that is preceded by "#Ansible: an old job" in the crontab'
- code: 'cron: name="a job for reboot" reboot=True job="/some/job.sh"'
description: 'Creates an entry like '@reboot /some/job.sh'
requirements: cron requirements: cron
author: Dane Summers author: Dane Summers
''' '''
@ -221,7 +232,8 @@ def main():
hour=dict(default='*'), hour=dict(default='*'),
day=dict(default='*'), day=dict(default='*'),
month=dict(default='*'), month=dict(default='*'),
weekday=dict(default='*') weekday=dict(default='*'),
reboot=dict(required=False, default=False, choices=BOOLEANS)
) )
) )
@ -234,9 +246,17 @@ def main():
day = module.params['day'] day = module.params['day']
month = module.params['month'] month = module.params['month']
weekday = module.params['weekday'] weekday = module.params['weekday']
reboot = module.boolean(module.params.get('reboot', False))
do_install = module.params['state'] == 'present' do_install = module.params['state'] == 'present'
changed = False changed = False
job = "%s %s %s %s %s %s" % (minute,hour,day,month,weekday,job)
if reboot and (True in [(x != '*') for x in [minute, hour, day, month, weekday]]):
module.fail_json(msg="You must specify either reboot=True or any of minute, hour, day, month, weekday")
if reboot:
job = "@reboot %s" % (job)
else:
job = "%s %s %s %s %s %s" % (minute,hour,day,month,weekday,job)
if not user: if not user:
user = "" user = ""
@ -288,3 +308,4 @@ def main():
# include magic from lib/ansible/module_common.py # include magic from lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>> #<<INCLUDE_ANSIBLE_MODULE_COMMON>>
main() main()

Loading…
Cancel
Save