diff --git a/Bundler/monit.xml b/Bundler/monit.xml index 81d971c..b16f4fc 100644 --- a/Bundler/monit.xml +++ b/Bundler/monit.xml @@ -1,6 +1,6 @@ - + diff --git a/Cfg/etc/monit/monitrc/info.xml b/Cfg/etc/monit/monitrc/info.xml deleted file mode 100644 index df5c536..0000000 --- a/Cfg/etc/monit/monitrc/info.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Cfg/etc/monit/monitrc/monitrc b/Cfg/etc/monit/monitrc/monitrc deleted file mode 100644 index cdab739..0000000 --- a/Cfg/etc/monit/monitrc/monitrc +++ /dev/null @@ -1,23 +0,0 @@ -# Fichier gere par Bcfg2 (plugin Cfg) -# -# A ne modifier que sur vert - -set daemon 60 - -set mailserver localhost, smtp.adm.crans.org - -set alert roots@crans.org { uid gid size nonexist data icmp invalid exec timeout resource checksum timestamp connection permission } - -set httpd port 2812 and - use address localhost - allow admin:plopisnotsecure - -set mail-format { -from: roots@crans.org -subject: Monit $HOST - $SERVICE : $EVENT -message: Monit $ACTION $SERVICE at $DATE on $HOST. - -} - -include /etc/monit/services -include /etc/monit/conf.d/* diff --git a/Python/etc/monit/monitrc b/Python/etc/monit/monitrc new file mode 100644 index 0000000..da8c7c2 --- /dev/null +++ b/Python/etc/monit/monitrc @@ -0,0 +1,30 @@ +# -*- coding: utf-8; mode: python -*- + +info["owner"] = "root" +info["group"] = "root" +info["perms"] = 0600 + +include("secrets") + +header() + + +@set daemon 60 +@ +@set mailserver localhost, smtp.adm.crans.org +@ +@set alert roots@crans.org { uid gid size nonexist data icmp invalid exec timeout resource checksum timestamp connection permission } +@ +@set httpd port 2812 and +@ use address localhost +print " allow monit:%s" % (secrets.monit_password) +@ +@set mail-format { +@from: roots@crans.org +@subject: Monit $HOST - $SERVICE : $EVENT +@message: Monit $ACTION $SERVICE at $DATE on $HOST. +@ +@} +@ +@include /etc/monit/services +@include /etc/monit/conf.d/*