Changing rsyslog configuration

diff --git a/common.yaml b/common.yaml
index 443bc07df15aa5e2d67f85fd8130f6e440d52bf2..727b9391c4b0cfa75c942acf41e7eadd7f0dac24 100644 (file)
--- 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 69375c3aec67a73c02f63c9d13a2bf5e9eebb68e..bf2b4c46de1908f8463e7c66280c562a15d44169 100644 (file)
--- 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 b4208027855c4cf455635a4f281db17ae8b9ed3e..5d54d72e449bdcb210ec0446e9e52f5a8e98be8f 100644 (file)
--- 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: