Linux-Help/formula-logrotate
1
0
Fork 0
mirror of synced 2024-11-03 00:58:59 -04:00
Code Issues Releases Wiki Activity

Merge pull request #9 from saltstack-formulas/patch-1

Browse source 
Moving logrotate directory setup from jobs.sls and config.sls to init.sls
This commit is contained in:
Niels Abspoel 2015-03-20 21:58:18 +01:00
commit bb8ed4cecc
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
logrotate/config.sls
View file

@ -3,16 +3,6 @@
include: include:
- logrotate - logrotate
logrotate_directory:
file.directory:
- name: {{ logrotate.include_dir }}
- user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }}
- group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }}
- mode: 755
- makedirs: True
- require:
- pkg: logrotate
logrotate_config: logrotate_config:
file.managed: file.managed:
- name: {{ logrotate.conf_file }} - name: {{ logrotate.conf_file }}

11
logrotate/init.sls
View file

@ -7,3 +7,14 @@ logrotate:
- name: {{ logrotate.service }} - name: {{ logrotate.service }}
- enable: True - enable: True
- reload: True - reload: True
logrotate_directory:
file.directory:
- name: {{ logrotate.include_dir }}
- user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }}
- group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }}
- mode: 755
- makedirs: True
- require:
- pkg: logrotate

10
logrotate/jobs.sls
View file

@ -5,16 +5,6 @@
include: include:
- logrotate - logrotate
logrotate_directory:
file.directory:
- name: {{ logrotate.include_dir }}
- user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }}
- group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }}
- mode: 755
- makedirs: True
- require:
- pkg: logrotate
{% for key,value in jobs.iteritems() %} {% for key,value in jobs.iteritems() %}
{{key}}: {{key}}:
file.managed: file.managed: