From 5b8c7d9c7d22db3a7351af9ced8dcfc88d16c454 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Fri, 10 Nov 2017 15:42:39 +0100
Subject: [PATCH] Changing rsyslog configuration

---
 common.yaml                                            | 8 ++++++++
 customer/pixelpark-mail/common.yaml                    | 8 +++-----
 customer/pixelpark-mail/test-mail02.pixelpark.net.yaml | 4 ----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/common.yaml b/common.yaml
index 443bc07d..727b9391 100644
--- a/common.yaml
+++ b/common.yaml
@@ -15,6 +15,14 @@ infra::profile::mcollective::common::plugins:
 
 sudo::purge: false
 
+#####################################################
+# Rsyslog configuration
+rsyslog::client::log_local: true
+rsyslog::client::log_remote: true
+rsyslog::client::remote_type: 'udp'
+rsyslog::client::server: 'loghost.pixelpark.com'
+
+
 accounts::users:
   philipp.dallig:
     apply: true
diff --git a/customer/pixelpark-mail/common.yaml b/customer/pixelpark-mail/common.yaml
index 69375c3a..bf2b4c46 100644
--- a/customer/pixelpark-mail/common.yaml
+++ b/customer/pixelpark-mail/common.yaml
@@ -101,11 +101,9 @@ infra::profile::postfix::ldap_bind_pw: >
 
 #####################################################
 # 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::client::log_local_custom:
+  - 'auth.*                      /var/log/auth.log'
+  - 'local6.*                    /var/log/freshclam.log'
 
 #####################################################
 # Logrotation
diff --git a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
index b4208027..5d54d72e 100644
--- a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
@@ -35,10 +35,6 @@ infra::profile::sasl::application:
 
 #####################################################
 # Rsyslog configuration
-rsyslog::client::log_local_custom:
-  - 'auth.*                      /var/log/auth.log'
-  - 'local6.*                    /var/log/freshclam.log'
-rsyslog::system_log_rate_limit_interval: 1
 
 # Logrotation
 infra::profile::logrotate::config:
-- 
2.39.5