From de8fe441e1c07b63f1c02aa231a8a56c9a9448ec Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Wed, 16 Oct 2013 11:16:18 -0400
Subject: rsyslog: setup default local config that gets us the same config as
 default from debian

Change-Id: If07ee200e2ae0d9cfaf8e405d6354c80d77330ca
---
 puppet/modules/site_config/manifests/syslog.pp | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 puppet/modules/site_config/manifests/syslog.pp

(limited to 'puppet/modules/site_config/manifests/syslog.pp')

diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp
new file mode 100644
index 00000000..c7c55c34
--- /dev/null
+++ b/puppet/modules/site_config/manifests/syslog.pp
@@ -0,0 +1,6 @@
+class site_config::syslog {
+
+  class { 'rsyslog::client': log_remote => false, log_local => true }
+
+}
+
-- 
cgit v1.2.3


From aa86d15696245c6ded59ca51ceff8f6eaf3119c5 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Wed, 16 Oct 2013 12:18:15 -0400
Subject: syslog: add rsyslog::snippet to anonymize logs it is necessary to
 install the fixed package from the leap.se repository until it is available
 in wheezy-backports, so install the apt preferences to pull it from there,
 and add its necessary library dependency from wheezy-backports

Change-Id: I379ff2ceaac1a978143715d3a7ced0011ca0d747
---
 puppet/modules/site_config/manifests/syslog.pp | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_config/manifests/syslog.pp')

diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp
index c7c55c34..6a9da460 100644
--- a/puppet/modules/site_config/manifests/syslog.pp
+++ b/puppet/modules/site_config/manifests/syslog.pp
@@ -1,6 +1,28 @@
 class site_config::syslog {
 
-  class { 'rsyslog::client': log_remote => false, log_local => true }
+  # we need to pull in rsyslog from the leap repository until it is availbale in
+  # wheezy-backports
+  apt::preferences_snippet { 'fixed_rsyslog_anon_package':
+    package  => 'rsyslog',
+    priority => '999',
+    pin      => 'release o=leap.se',
+    before   => Class['rsyslog::install']
+  }
 
-}
+  apt::preferences_snippet { 'rsyslog_anon_libestr0':
+    package  => 'libestr0',
+    priority => '999',
+    pin      => 'release a=wheezy-backports',
+    before   => Class['rsyslog::install']
+  }
+
+  class { 'rsyslog::client':
+    log_remote => false,
+    log_local  => true
+  }
 
+  rsyslog::snippet { '00-anonymize_logs':
+    content => '$ModLoad mmanon
+action(type="mmanon" ipv4.bits="32" mode="rewrite")'
+  }
+}
-- 
cgit v1.2.3


From a44e598c29b66bd560dbe864b70f13aa324c1437 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Wed, 16 Oct 2013 15:59:26 -0400
Subject: fix for rsyslog-relp being installed first, resulting in dependency
 errors (#4161)

Change-Id: I2f0bcc5b4cb5effae57051f04251aeb8b09a4c6d
---
 puppet/modules/site_config/manifests/syslog.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_config/manifests/syslog.pp')

diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp
index 6a9da460..73d4f58f 100644
--- a/puppet/modules/site_config/manifests/syslog.pp
+++ b/puppet/modules/site_config/manifests/syslog.pp
@@ -3,14 +3,14 @@ class site_config::syslog {
   # we need to pull in rsyslog from the leap repository until it is availbale in
   # wheezy-backports
   apt::preferences_snippet { 'fixed_rsyslog_anon_package':
-    package  => 'rsyslog',
+    package  => 'rsyslog-*',
     priority => '999',
     pin      => 'release o=leap.se',
     before   => Class['rsyslog::install']
   }
 
-  apt::preferences_snippet { 'rsyslog_anon_libestr0':
-    package  => 'libestr0',
+  apt::preferences_snippet { 'rsyslog_anon_depends':
+    package  => 'libestr0 librelp0',
     priority => '999',
     pin      => 'release a=wheezy-backports',
     before   => Class['rsyslog::install']
-- 
cgit v1.2.3


From c884bc04e2eb29bdaacc5c6673ed7f212dc28e88 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Thu, 17 Oct 2013 13:48:01 -0400
Subject: syslog: fix apt_preferences snippet to glob on both rsyslog and
 rsyslog-relp (#4161)

Change-Id: I7eaa35897da3b24833be3b2c14db99cd66b547c0
---
 puppet/modules/site_config/manifests/syslog.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_config/manifests/syslog.pp')

diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp
index 73d4f58f..d3abeca1 100644
--- a/puppet/modules/site_config/manifests/syslog.pp
+++ b/puppet/modules/site_config/manifests/syslog.pp
@@ -3,7 +3,7 @@ class site_config::syslog {
   # we need to pull in rsyslog from the leap repository until it is availbale in
   # wheezy-backports
   apt::preferences_snippet { 'fixed_rsyslog_anon_package':
-    package  => 'rsyslog-*',
+    package  => 'rsyslog*',
     priority => '999',
     pin      => 'release o=leap.se',
     before   => Class['rsyslog::install']
-- 
cgit v1.2.3