From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 27 Oct 2017 11:33:18 +0000 (+0200)
Subject: Moving general parts of rsyslog and logrotate configuration to customer/pixelpark... 
X-Git-Tag: v0.1.0~2145
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1136c593f74ca10cd901b7864cb1c3b2c98365f2;p=pixelpark%2Fhiera.git

Moving general parts of rsyslog and logrotate configuration to customer/pixelpark-mail/common.yaml
---

diff --git a/customer/pixelpark-mail/common.yaml b/customer/pixelpark-mail/common.yaml
index 42933b41..780057ec 100644
--- 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 44817765..1d28ec77 100644
--- 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