diff --git a/cron/config.sls b/cron/config.sls index 3ccd9e3..a7a1cf9 100644 --- a/cron/config.sls +++ b/cron/config.sls @@ -7,35 +7,35 @@ {% for task,task_options in cron_settings.tasks.items() %} cron.{{ task }}: - cron.{{ task_options.type|default('present') }}: - - name: '{{ task_options.name }}' - {% if 'user' in task_options %} - - user: {{ task_options.user|default('root') }} - {% endif %} - {% if 'minute' in task_options %} - - minute: '{{ task_options.minute }}' - {% endif %} - {% if 'hour' in task_options %} - - hour: '{{ task_options.hour }}' - {% endif %} - {% if 'daymonth' in task_options %} - - daymonth: '{{ task_options.daymonth }}' - {% endif %} - {% if 'month' in task_options %} - - month: '{{ task_options.month }}' - {% endif %} - {% if 'dayweek' in task_options %} - - dayweek: '{{ task_options.dayweek }}' - {% endif %} - {% if 'commented' in task_options and task_options.commented %} - - commented: True - {% endif %} - {% if 'special' in task_options %} - - special: '{{ task_options.special }}' - {% endif %} - - identifier: '{{ task }}' - {% if 'comment' in task_options %} - - comment: '{{ task_options.comment }}' - {% endif %} + cron.{{ task_options.type|default('present') }}: + - name: '{{ task_options.name }}' + {% if 'user' in task_options %} + - user: {{ task_options.user|default('root') }} + {% endif %} + {% if 'minute' in task_options %} + - minute: '{{ task_options.minute }}' + {% endif %} + {% if 'hour' in task_options %} + - hour: '{{ task_options.hour }}' + {% endif %} + {% if 'daymonth' in task_options %} + - daymonth: '{{ task_options.daymonth }}' + {% endif %} + {% if 'month' in task_options %} + - month: '{{ task_options.month }}' + {% endif %} + {% if 'dayweek' in task_options %} + - dayweek: '{{ task_options.dayweek }}' + {% endif %} + {% if 'commented' in task_options and task_options.commented %} + - commented: True + {% endif %} + {% if 'special' in task_options %} + - special: '{{ task_options.special }}' + {% endif %} + - identifier: '{{ task }}' + {% if 'comment' in task_options %} + - comment: '{{ task_options.comment }}' + {% endif %} {% endfor %} {% endif %} diff --git a/cron/init.sls b/cron/init.sls index eff3fc8..74ad02e 100644 --- a/cron/init.sls +++ b/cron/init.sls @@ -2,6 +2,6 @@ # vim: ft=sls include: - - cron.install - - cron.config - - cron.service + - cron.install + - cron.config + - cron.service diff --git a/cron/install.sls b/cron/install.sls index 6083ed1..2676d26 100644 --- a/cron/install.sls +++ b/cron/install.sls @@ -4,5 +4,5 @@ {% from "cron/map.jinja" import cron_settings with context %} cron.install: - pkg.installed: - - name: {{ cron_settings.pkg }} + pkg.installed: + - name: {{ cron_settings.pkg }} diff --git a/cron/map.jinja b/cron/map.jinja index d91a7db..56fd898 100644 --- a/cron/map.jinja +++ b/cron/map.jinja @@ -2,23 +2,23 @@ # vim: ft=jinja {% set os_family_map = salt['grains.filter_by']({ - 'RedHat': { - 'pkg': 'cronie', - 'service': 'crond', - }, - 'Suse': { - 'pkg': 'cronie', - 'service': 'cron', - }, - 'Debian': { - 'pkg': 'cron', - 'service': 'cron', - }, + 'RedHat': { + 'pkg': 'cronie', + 'service': 'crond', + }, + 'Suse': { + 'pkg': 'cronie', + 'service': 'cron', + }, + 'Debian': { + 'pkg': 'cron', + 'service': 'cron', + }, }, grain='os_family', merge=salt['pillar.get']('cron:lookup')) %} {% set cron_settings = salt['pillar.get']( - 'cron', - default=os_family_map, - merge=True - ) + 'cron', + default=os_family_map, + merge=True + ) %} diff --git a/cron/service.sls b/cron/service.sls index ea11acc..bd20ea4 100644 --- a/cron/service.sls +++ b/cron/service.sls @@ -5,11 +5,11 @@ cron.service: {% if 'enabled' not in cron_settings or ( 'enabled' in cron_settings and cron_settings.enabled ) %} - service.running: - - name: {{ cron_settings.service }} - - enable: True + service.running: + - name: {{ cron_settings.service }} + - enable: True {% else %} - service.dead: - - name: {{ cron_settings.service }} - - enable: False + service.dead: + - name: {{ cron_settings.service }} + - enable: False {% endif %} diff --git a/pillar.example b/pillar.example index fceb4d5..f7137e9 100644 --- a/pillar.example +++ b/pillar.example @@ -1,33 +1,33 @@ cron: - enabled: True # Default - lookup: # Not needed, just if you want to use another cron program - pkg: 'cronie' - tasks: - task1: - type: 'present' # Default - name: 'echo test > /tmp/test' - user: 'root' - minute: 0 - hour: 0 - daymonth: 7 - month: 1 - dayweek: 6 - comment: 'comment1' - task2: - type: 'absent' # To remove that crontask - name: 'echo task2 > /tmp/test2' - user: 'root' - minute: 'random' - hour: 1 - task3: - type: 'absent' - name: 'echo task3 > /tmp/test3' - user: 'root' - special: '@hourly' - comment: 'comment3' - task4: - type: 'present' # run every 5 minutes - user: 'root' - minute: '*/5' - hour: '*' - comment: 'comment4' + enabled: True # Default + lookup: # Not needed, just if you want to use another cron program + pkg: 'cronie' + tasks: + task1: + type: 'present' # Default + name: 'echo test > /tmp/test' + user: 'root' + minute: 0 + hour: 0 + daymonth: 7 + month: 1 + dayweek: 6 + comment: 'comment1' + task2: + type: 'absent' # To remove that crontask + name: 'echo task2 > /tmp/test2' + user: 'root' + minute: 'random' + hour: 1 + task3: + type: 'absent' + name: 'echo task3 > /tmp/test3' + user: 'root' + special: '@hourly' + comment: 'comment3' + task4: + type: 'present' # run every 5 minutes + user: 'root' + minute: '*/5' + hour: '*' + comment: 'comment4'