Changes on logrotating

diff --git a/customer/pixelpark-mail/common.yaml b/customer/pixelpark-mail/common.yaml
index 37285d764e09150e7d9a0eb3974e5f392080ab33..38119357a96511a12a3c509990ea3b83c6763903 100644 (file)
--- 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 737fd57ec13b66e81c4da4b784c28df22680bc89..6612d73e246f8b3cfe258e82e63a5d4e6581bca4 100644 (file)
--- 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: