Merge pull request #12 from fortune-juggle/fix/5

fixes issue #5
pull/16/head
Nitin Madhok 8 years ago
commit d6ce3cd1bc
  1. 4
      logrotate/init.sls
  2. 7
      logrotate/jobs.sls
  3. 30
      pillar.example

@ -11,8 +11,8 @@ 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) }}
- user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }}
- group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }}
- mode: 755
- makedirs: True
- require:

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

@ -4,12 +4,24 @@ logrotate:
pkg: logrotate
service: crond
jobs:
/tmp/var/log/mysql/error:
- weekly
- missingok
- rotate 52
- compress
- delaycompress
- notifempty
- create 640 root adm
- sharedscripts
/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
- missingok
- rotate 52
- compress
- delaycompress
- notifempty
- create 640 root adm
- sharedscripts

Loading…
Cancel
Save