From 84d159ba3c2fd3293e9d8b780574b4b13dffa3d2 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 27 Oct 2017 14:48:03 +0200 Subject: [PATCH] Changes on logrotating --- customer/pixelpark-mail/common.yaml | 6 ++---- customer/pixelpark-mail/test-mail02.pixelpark.net.yaml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/customer/pixelpark-mail/common.yaml b/customer/pixelpark-mail/common.yaml index 37285d76..38119357 100644 --- a/customer/pixelpark-mail/common.yaml +++ b/customer/pixelpark-mail/common.yaml @@ -110,9 +110,7 @@ rsyslog::client::server: 'loghost.pixelpark.com' ##################################################### # Logrotation -logrotate::hieramerge: true - -logrotate::config: +infra::profile::logrotate::config: rotate_every: 'week' rotate: 4 create: true @@ -125,7 +123,7 @@ logrotate::config: olddir: false ifempty: false -logrotate::rules: +infra::profile::logrotate::rules: wtmp: path: '/var/log/wtmp' missingok: true diff --git a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml index 737fd57e..6612d73e 100644 --- a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml +++ b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml @@ -40,10 +40,10 @@ rsyslog::client::log_local_custom: | local6.* /var/log/freshclam.log # Logrotation -logrotate::config: +infra::profile::logrotate::config: dateformat: '-%Y-%m-%d' -logrotate::rules: +infra::profile::logrotate::rules: # wtmp: # dateformat: '-%Y-%m-%d' # btmp: -- 2.39.5