Merge pull request #1234 from brendandburns/fix

Add initial logrotate support.
pull/6/head
Joe Beda 2014-09-09 13:50:06 -07:00
commit 732b7ce7ef
4 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,11 @@
/var/log/{{ file }}.log {
rotate 5
copytruncate
missingok
notifempty
compress
maxsize 100m
daily
create 0644 root root
}

View File

@ -0,0 +1 @@
logrotate /etc/logrotate.conf

View File

@ -0,0 +1,26 @@
logrotate:
pkg:
- installed
{% set logrotate_files = ['scheduler', 'kube-proxy', 'kubelet', 'apiserver', 'controller-manager'] %}
{% for file in logrotate_files %}
/etc/logrotate.d/{{ file }}:
file:
- managed
- source: salt://logrotate/conf
- template: jinja
- user: root
- group: root
- mode: 644
- context:
file: {{ file }}
{% endfor %}
/etc/cron.hourly/logrotate:
file:
- managed
- source: salt://logrotate/cron
- template: jinja
- user: root
- group: root
- mode: 644

View File

@ -10,6 +10,7 @@ base:
- kube-proxy
- cadvisor
- nsinit
- logrotate
{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
- openvpn-client
{% else %}
@ -24,6 +25,7 @@ base:
- controller-manager
- scheduler
- nginx
- logrotate
{% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
- openvpn
{% endif %}