1
0
Fork 0

new possibility to configure a job giving the raw content to store as a file

This commit is contained in:
Eric Veiras Galisson 2018-07-12 12:44:01 +02:00
parent 251937f9c3
commit 4ac8535dd7
2 changed files with 28 additions and 2 deletions

View File

@ -6,16 +6,20 @@ include:
- logrotate
{% for key, value in jobs.items() %}
{% set contents = value.get('contents', False) %}
logrotate-{{ key }}:
file.managed:
- name: {{ logrotate.include_dir }}/{{ key.split("/")[-1] }}
- source: salt://logrotate/templates/job.tmpl
- template: jinja
- user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }}
- group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }}
- mode: {{ salt['pillar.get']('logrotate:config:mode', '644') }}
- require:
- pkg: logrotate-pkg
{% if contents %}
- contents: {{ contents | yaml_encode }}
{% else %}
- source: salt://logrotate/templates/job.tmpl
- template: jinja
- context:
{% if value is mapping %}
path: {{ value.get('path', []) }}
@ -24,4 +28,6 @@ logrotate-{{ key }}:
path: {{ key }}
data: {{ value }}
{% endif %}
{% endif %}
{%- endfor -%}

View File

@ -47,3 +47,23 @@ logrotate:
- postrotate
- /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
- endscript
nginx:
contents: |
/var/log/nginx/*.log{
weekly
missingok
compress
delaycompress
notifempty
create 0640 www-data adm
sharedscripts
prerotate
if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
run-parts /etc/logrotate.d/httpd-prerotate; \
fi \
endscript
postrotate
invoke-rc.d nginx rotate >/dev/null 2>&1
endscript
}