Merge pull request #9 from saltstack-formulas/patch-1
Moving logrotate directory setup from jobs.sls and config.sls to init.sls
This commit is contained in:
commit
bb8ed4cecc
|
@ -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 }}
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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:
|
||||||
|
|
Loading…
Reference in a new issue