diff --git a/logrotate/jobs.sls b/logrotate/jobs.sls index 17da253..6b08ce9 100644 --- a/logrotate/jobs.sls +++ b/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 %} diff --git a/test/integration/default/controls/jobs.rb b/test/integration/default/controls/jobs.rb index dc59bde..b4edcce 100644 --- a/test/integration/default/controls/jobs.rb +++ b/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' }