From 61236a2c5971a4cc02c25e87b1226ad8e8874d60 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Oct 31 2017 11:02:18 +0000 Subject: Merge branch 'tampakrap_logrotate' into 'production' enable and start the logrotate.timer service on all sle12/leap machines See merge request infra/salt!68 --- diff --git a/salt/profile/log.sls b/salt/profile/log.sls new file mode 100644 index 0000000..bfae231 --- /dev/null +++ b/salt/profile/log.sls @@ -0,0 +1,8 @@ +# TODO: replace with a proper logrotate formula +{% set osmajorrelease = salt['grains.get']('osmajorrelease') %} + +{% if osmajorrelease in ['12', '42'] %} +logrotate.timer: + service.running: + - enable: True +{% endif %} diff --git a/salt/role/base.sls b/salt/role/base.sls index 191ffe6..84138f7 100644 --- a/salt/role/base.sls +++ b/salt/role/base.sls @@ -2,6 +2,7 @@ include: - profile.accounts - profile.apparmor - profile.ldap.client + - profile.log - profile.regional - profile.salt.minion - profile.zypper