2 files changed, 15 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp
index e9497baf..2fdc4794 100644
--- a/puppet/modules/site_config/manifests/remove/jessie.pp
+++ b/puppet/modules/site_config/manifests/remove/jessie.pp
@@ -7,8 +7,9 @@ class site_config::remove::jessie {
   }
 
   apt::preferences_snippet {
-    [ 'facter', 'obfsproxy', 'python-twisted', 'unbound' ]:
-      ensure => absent;
+    [ 'facter', 'obfsproxy', 'python-twisted', 'unbound', 'passenger',
+      'rsyslog_anon_depends' ]:
+        ensure => absent;
   }
 
 }
diff --git a/puppet/modules/site_config/manifests/remove/webapp.pp b/puppet/modules/site_config/manifests/remove/webapp.pp
index 58f59815..963eb705 100644
--- a/puppet/modules/site_config/manifests/remove/webapp.pp
+++ b/puppet/modules/site_config/manifests/remove/webapp.pp
@@ -4,4 +4,16 @@ class site_config::remove::webapp {
     '/etc/apache/sites-enabled/leap_webapp.conf':
       notify => Service['apache'];
   }
+
+  # Ensure haproxy is removed
+  package { 'haproxy':
+    ensure => purged,
+  }
+  augeas { 'haproxy':
+    incl    => '/etc/check_mk/mrpe.cfg',
+    lens    => 'Spacevars.lns',
+    changes => [ 'rm /files/etc/check_mk/mrpe.cfg/Haproxy' ],
+    require => File['/etc/check_mk/mrpe.cfg'];
+  }
+
 }