Merge branch '0.5' into develop

Conflicts:
	provider_base/services/tor.json

Change-Id: I826579945a0d93c43384f0fd12c9833762b084cf

1 files changed, 24 insertions, 0 deletions

diff --git a/puppet/modules/site_check_mk/manifests/agent/webapp.pp b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
new file mode 100644
index 00000000..cb160d83
--- /dev/null
+++ b/puppet/modules/site_check_mk/manifests/agent/webapp.pp
@@ -0,0 +1,24 @@
+class site_check_mk::agent::webapp {
+
+  # check webapp login + soledad sync
+  package { [ 'python-srp', 'python-requests', 'python-yaml', 'python-u1db' ]:
+    ensure => installed
+  }
+  file { '/usr/lib/check_mk_agent/local/nagios-webapp_login.py':
+    ensure => link,
+    target => '/srv/leap/webapp/test/nagios/webapp_login.py'
+  }
+  file { '/usr/lib/check_mk_agent/local/soledad_sync.py':
+    ensure => link,
+    target => '/srv/leap/webapp/test/nagios/soledad_sync.py'
+  }
+
+
+  # check syslog
+  concat::fragment { 'syslog_webapp':
+    source  => 'puppet:///modules/site_check_mk/agent/logwatch/syslog/webapp.cfg',
+    target  => '/etc/check_mk/logwatch.d/syslog.cfg',
+    order   => '02';
+  }
+
+}