Browse Source

Merge 26f74e58ac into 1848fd6e0d

pull/71/merge
Georg 5 months ago
parent
commit
50355cf893
No account linked to committer's email address
3 changed files with 7 additions and 0 deletions
  1. +1
    -0
      logrotate/osfamilymap.yaml
  2. +4
    -0
      logrotate/service.sls
  3. +2
    -0
      test/integration/default/controls/base.rb

+ 1
- 0
logrotate/osfamilymap.yaml View File

@@ -14,6 +14,7 @@ RedHat:
default_config:
dateext: true
Suse:
service: null
login_records_jobs: false
default_config:
dateext: true

+ 4
- 0
logrotate/service.sls View File

@@ -3,6 +3,8 @@

{% from "logrotate/map.jinja" import logrotate with context %}

{%- if logrotate.service is not none %}

include:
- logrotate.config
- logrotate.install
@@ -15,3 +17,5 @@ logrotate:
- pkg: logrotate-pkg
- file: logrotate-config
- file: logrotate-directory

{%- endif %}

+ 2
- 0
test/integration/default/controls/base.rb View File

@@ -49,6 +49,8 @@ control 'logrotate.service.running' do
'cronie'
when 'redhat', 'fedora'
'crond'
when 'suse'
'logrotate.timer'
else
'cron'
end

Loading…
Cancel
Save