Moving general parts of rsyslog and logrotate configuration to customer/pixelpark...

diff --git a/customer/pixelpark-mail/common.yaml b/customer/pixelpark-mail/common.yaml
index 42933b41083086beee7ccc0fa9023658663f1b14..780057ecd187e9e4e9fa13e322a0b3e90b505fd9 100644 (file)
--- a/customer/pixelpark-mail/common.yaml
+++ b/customer/pixelpark-mail/common.yaml
@@ -99,4 +99,52 @@ infra::profile::postfix::ldap_bind_pw: >
     EPXIdDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD/aCWYpB6KwUIcLp1T
     EKskgBArkfXhMZNEUfrTvFILs4Ig]
 
+#####################################################
+# Rsyslog configuration
+rsyslog::client::log_local: true
+rsyslog::client::log_remote: true
+rsyslog::client::remote_type: 'udp'
+rsyslog::client::server: 'loghost.pixelpark.com'
+#rsyslog::client::remote_forward_format: ''
+
+#####################################################
+# Logrotation
+
+logrotate::config:
+  rotate_every: 'week'
+  rotate: 4
+  create: true
+  dateext: true
+  #dateformat: '-%Y-%m-%d'
+  compress: true
+  delaycompress: true
+  missingok: true
+  mail: false
+  olddir: false
+  ifempty: false
 
+logrotate::rules:
+  wtmp:
+    path: '/var/log/wtmp'
+    missingok: true
+    dateext: true
+    #dateformat: '-%Y-%m-%d'
+    rotate_every: 'month'
+    create: true
+    create_mode: '0664'
+    create_owner: 'root'
+    create_group: 'utmp'
+    minsize: '1M'
+    rotate: 12
+  btmp:
+    path: '/var/log/btmp'
+    missingok: true
+    dateext: true
+    #dateformat: '-%Y-%m-%d'
+    rotate_every: 'month'
+    create: true
+    create_mode: '0600'
+    create_owner: 'root'
+    create_group: 'utmp'
+    minsize: '1M'
+    rotate: 1

diff --git a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
index 44817765a9828c13d8efbf0003d1c51fc7e3a50e..1d28ec773a00c2525c4e2bfda2f31f019012c979 100644 (file)
--- a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
@@ -34,55 +34,20 @@ infra::profile::sasl::application:
 # Postfix configuration:
 
 #####################################################
-# rsyslog configuration
-rsyslog::client::log_local: true
-rsyslog::client::log_remote: true
-rsyslog::client::remote_type: 'udp'
-rsyslog::client::server: 'loghost.pixelpark.com'
-#rsyslog::client::remote_forward_format: ''
+# Rsyslog configuration
 rsyslog::client::log_local_custom: |
   auth.*                      /var/log/auth.log
   local6.*                    /var/log/freshclam.log
 
 # Logrotation
 logrotate::config:
-  rotate_every: 'week'
-  rotate: 4
-  create: true
-  dateext: true
   dateformat: '-%Y-%m-%d'
-  compress: true
-  delaycompress: true
-  missingok: true
-  mail: false
-  olddir: false
-  ifempty: false
 
 logrotate::rules:
   wtmp:
-    path: '/var/log/wtmp'
-    missingok: true
-    dateext: true
     dateformat: '-%Y-%m-%d'
-    rotate_every: 'month'
-    create: true
-    create_mode: '0664'
-    create_owner: 'root'
-    create_group: 'utmp'
-    minsize: '1M'
-    rotate: 12
   btmp:
-    path: '/var/log/btmp'
-    missingok: true
-    dateext: true
     dateformat: '-%Y-%m-%d'
-    rotate_every: 'month'
-    create: true
-    create_mode: '0600'
-    create_owner: 'root'
-    create_group: 'utmp'
-    minsize: '1M'
-    rotate: 1
   samba:
     path: '/var/log/samba/*'
     ifempty: false