浏览代码

integrating patch from danny-smit, fixes #33

tags/v0.9.0
Eric Veiras Galisson 6 年前
父节点
当前提交
0d039778f8
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. +2
    -2
      logrotate/jobs.sls
  2. +1
    -2
      test/integration/default/controls/jobs.rb

+ 2
- 2
logrotate/jobs.sls 查看文件

@@ -22,10 +22,10 @@ logrotate-{{ key }}:
- template: jinja
- context:
{% if value is mapping %}
path: {{ value.get('path', []) }}
path: {{ value.get('path', [key]) }}
data: {{ value.get('config', []) }}
{% else %}
path: {{ key }}
path: [ {{ key }} ]
data: {{ value }}
{% endif %}
{% endif %}

+ 1
- 2
test/integration/default/controls/jobs.rb 查看文件

@@ -7,8 +7,7 @@ describe file('/etc/logrotate.d/error') do
it { should be_owned_by 'root' }
it { should be_grouped_into 'root' }
its('mode') { should cmp '0644' }
# FIXME
#its('content') { should include '/tmp/var/log/mysql/error' }
its('content') { should include '/tmp/var/log/mysql/error' }
its('content') { should include 'weekly' }
its('content') { should include 'missingok' }
its('content') { should include 'rotate 52' }

正在加载...
取消
保存