diff --git a/README b/README index 7f487a0b47e233549689e34bbdfef4195126f39b..896833ad3980530b824ffa7c1b555dc003e57b67 100644 --- a/README +++ b/README @@ -17,8 +17,7 @@ https://git.sarava.org/?p=puppet-mail.git;a=blob_plain;f=manifests/sympa.pp;hb=H Riseup Networks puppet class (not published) Dependencies: -* check_mk to setup nagios process checks -* FIXME: probably other stuff +* FIXME: probably stuff How to use ========== diff --git a/manifests/init.pp b/manifests/init.pp index c8deddb02c2b2766ad6a78e4149c93a28993a19c..600437eb90881ca5f7f1fcdb35097c928e53c597 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,6 +1,5 @@ class sympa ( $cgitype = 'fcgid', - $nagios = true, $munin = true, $samilter = true, $upstream = false @@ -13,7 +12,6 @@ class sympa ( } if $munin { include sympa::munin } - if $nagios { include sympa::nagios } if $samilter { include sympa::samilter } case $cgitype { diff --git a/manifests/nagios.pp b/manifests/nagios.pp deleted file mode 100644 index ba35f32565ad8ab6dc375caadfeebe0e6cee063e..0000000000000000000000000000000000000000 --- a/manifests/nagios.pp +++ /dev/null @@ -1,30 +0,0 @@ -# FIXME: this has riseup specific paths currently - -class sympa::nagios { - - check_mk::agent::ps { - 'archived.pl': - procname => '~/usr/bin/perl /home/sympa/bin/archived\.pl'; - 'wwsympa.fcgi': - procname => '~/usr/bin/perl /home/sympa/bin/wwsympa\.fcgi', - levels => '1, 1, 10, 12'; - 'bounced.pl': - procname => '~/usr/bin/perl /home/sympa/bin/bounced\.pl', - levels => '1, 1, 2, 2'; - 'task_manager.pl': - procname => '~/usr/bin/perl /home/sympa/bin/task_manager\.pl'; - 'sympa.pl': - procname => '~/usr/bin/perl /home/sympa/bin/sympa\.pl', - levels => '2, 2, 2, 2'; - # sympa scales bulk processes automatically, but there should be at - # least 1 and almost always 10 - 'bulk.pl': - procname => '~/usr/bin/perl /home/sympa/bin/bulk\.pl', - levels => '1, 5, 10, 10'; - - # FIXME: why isn't this being done in the {site_}apache module? - 'apache': - procname => '~/usr/sbin/apache2 -k start', - levels => '4, 4, 6, 6'; - } -}