1
0
Fork 0
mirror of synced 2024-12-21 21:51:09 -05:00

fixes issue #5

splits config file name and log file path, so you configure both.
This fixes #5.
This commit is contained in:
Nicole Scherfenberg 2015-05-05 15:20:54 +02:00
parent 8f64b9ab03
commit e70f0818d8
3 changed files with 29 additions and 12 deletions

View file

@ -6,7 +6,7 @@ include:
- logrotate - logrotate
{% for key,value in jobs.iteritems() %} {% for key,value in jobs.iteritems() %}
{{key}}: logrotate_{{key}}:
file.managed: file.managed:
- name: {{ logrotate.include_dir }}/{{ key.split("/")[-1] }} - name: {{ logrotate.include_dir }}/{{ key.split("/")[-1] }}
- source: salt://logrotate/templates/job.tmpl - source: salt://logrotate/templates/job.tmpl
@ -19,6 +19,11 @@ include:
- watch_in: - watch_in:
- service: {{ logrotate.service }} - service: {{ logrotate.service }}
- context: - context:
{% if value is mapping %}
path: {{ value.get('path', key) }}
data: {{ value.get('config', []) }}
{% else %}
path: {{ key }} path: {{ key }}
data: {{ value }} data: {{ value }}
{% endif %}
{%- endfor -%} {%- endfor -%}

View file

@ -5,6 +5,18 @@ logrotate:
service: crond service: crond
jobs: jobs:
/tmp/var/log/mysql/error: /tmp/var/log/mysql/error:
config:
- weekly
- missingok
- rotate 52
- compress
- delaycompress
- notifempty
- create 640 root adm
- sharedscripts
mysql:
path: /tmp/var/log/mysql/*.log
config:
- weekly - weekly
- missingok - missingok
- rotate 52 - rotate 52