Merge pull request #38 from daks/bug-jobname
integrating patch from danny-smit, fixes #33
This commit is contained in:
commit
cc2bdaed82
2 changed files with 3 additions and 4 deletions
|
@ -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 %}
|
||||
|
|
|
@ -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' }
|
||||
|
|
Loading…
Reference in a new issue