3 files changed, 21 insertions, 17 deletions
diff --git a/puppet/modules/site_check_mk/manifests/agent/soledad.pp b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
index f4a3f3a6..a8febaae 100644
--- a/puppet/modules/site_check_mk/manifests/agent/soledad.pp
+++ b/puppet/modules/site_check_mk/manifests/agent/soledad.pp
@@ -1,17 +1,8 @@
+# Configure soledad check_mk checks
 class site_check_mk::agent::soledad {
 
   file { '/etc/check_mk/logwatch.d/soledad.cfg':
     source => 'puppet:///modules/site_check_mk/agent/logwatch/soledad.cfg',
   }
 
-  # local nagios plugin checks via mrpe
-
-  augeas { 'Soledad_Procs':
-    incl    => '/etc/check_mk/mrpe.cfg',
-    lens    => 'Spacevars.lns',
-    changes => [
-      'rm /files/etc/check_mk/mrpe.cfg/Soledad_Procs',
-      'set Soledad_Procs \'/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -a "/usr/bin/python /usr/bin/twistd --uid=soledad --gid=soledad --pidfile=/var/run/soledad.pid --logfile=/var/log/soledad.log web --wsgi=leap.soledad.server.application --port=ssl:2323:privateKey=/etc/x509/keys/leap.key:certKey=/etc/x509/certs/leap.crt:sslmethod=SSLv23_METHOD"\'' ],
-    require => File['/etc/check_mk/mrpe.cfg'];
-  }
 }
diff --git a/puppet/modules/site_config/manifests/remove/soledad.pp b/puppet/modules/site_config/manifests/remove/soledad.pp
new file mode 100644
index 00000000..46c23f26
--- /dev/null
+++ b/puppet/modules/site_config/manifests/remove/soledad.pp
@@ -0,0 +1,12 @@
+# remove possible leftovers on soledad nodes
+class site_config::remove::soledad {
+
+  # remove soledad procs check because leap_cli already checks for them
+  augeas { 'Soledad_Procs':
+    incl    => '/etc/check_mk/mrpe.cfg',
+    lens    => 'Spacevars.lns',
+    changes => [ 'rm /files/etc/check_mk/mrpe.cfg/Soledad_Procs' ],
+    require => File['/etc/check_mk/mrpe.cfg'];
+  }
+
+}
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp
index 6cf806d0..81f51188 100644
--- a/puppet/modules/soledad/manifests/server.pp
+++ b/puppet/modules/soledad/manifests/server.pp
@@ -2,8 +2,9 @@
 class soledad::server {
   tag 'leap_service'
 
-  include site_config::default
-  include soledad::common
+  include ::site_config::default
+  include ::soledad::common
+  include ::site_config::remove::soledad
 
   $soledad              = hiera('soledad')
   $couchdb_user         = $soledad['couchdb_soledad_user']['username']
@@ -90,11 +91,11 @@ class soledad::server {
   }
   user {
     'soledad':
-      ensure    => present,
-      system    => true,
-      gid       => 'soledad',
-      home      => '/srv/leap/soledad',
-      require   => Group['soledad'];
+      ensure  => present,
+      system  => true,
+      gid     => 'soledad',
+      home    => '/srv/leap/soledad',
+      require => Group['soledad'];
     'soledad-admin':
       ensure  => present,
       system  => true,