From 58dca4e50ba32dcad9551300691c12c55e740344 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Fri, 9 May 2014 08:59:17 +0200 Subject: [PATCH 01/10] monit addon: First version. --- config/rootfiles/packages/monit | 7 +++ lfs/monit | 93 +++++++++++++++++++++++++++++++++ make.sh | 1 + src/initscripts/init.d/monit | 39 ++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 config/rootfiles/packages/monit create mode 100644 lfs/monit create mode 100644 src/initscripts/init.d/monit diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit new file mode 100644 index 000000000..7a8c5f691 --- /dev/null +++ b/config/rootfiles/packages/monit @@ -0,0 +1,7 @@ +etc/rc.d/rc0.d/K40monit +etc/rc.d/rc3.d/S60monit +etc/rc.d/rc6.d/K40monit +etc/init.d/monit +usr/bin/monit +#usr/share/man/man1/monit.1 +var/ipfire/backup/addons/includes/monit diff --git a/lfs/monit b/lfs/monit new file mode 100644 index 000000000..35bb949a2 --- /dev/null +++ b/lfs/monit @@ -0,0 +1,93 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 5.8 + +THISAPP = monit-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = monit +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c6873b0828f872676f9e7fe1476a8dc2 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \ + /var/ipfire/backup/addons/includes/monit + ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60monit + ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40monit + ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40monit + + # Remove temporary file. + rm -vf /root/.rnd + +# @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d280d9c8f..e94e8556d 100755 --- a/make.sh +++ b/make.sh @@ -730,6 +730,7 @@ buildipfire() { ipfiremake iftop ipfiremake motion ipfiremake joe + ipfiremake monit ipfiremake nut ipfiremake watchdog ipfiremake libpri diff --git a/src/initscripts/init.d/monit b/src/initscripts/init.d/monit new file mode 100644 index 000000000..79cec500e --- /dev/null +++ b/src/initscripts/init.d/monit @@ -0,0 +1,39 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/monit +# +# Description : monit monitoring daemon +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Starting monit..." + loadproc /usr/sbin/monit + ;; + + stop) + boot_mesg "Stopping monit..." + killproc /usr/sbin/monit + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/sbin/monit + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/monit From 6047b2c178020dc98fb84aa520aea23f9f957bd3 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Sat, 17 May 2014 18:42:21 +0200 Subject: [PATCH 02/10] monit addon: Fixed initscript stuff --- config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/packages/monit | 6 ++---- lfs/initscripts | 0 lfs/monit | 12 +++++------- 5 files changed, 9 insertions(+), 11 deletions(-) mode change 100644 => 100755 config/rootfiles/common/armv5tel/initscripts mode change 100644 => 100755 config/rootfiles/common/i586/initscripts mode change 100644 => 100755 lfs/initscripts diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts old mode 100644 new mode 100755 index ecd01ec1e..2fffcf526 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -53,6 +53,7 @@ etc/rc.d/init.d/mISDN #etc/rc.d/init.d/mldonkey etc/rc.d/init.d/modules #etc/rc.d/init.d/motion +#etc/rc.d/init.d/monit etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs #etc/rc.d/init.d/mpd diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts old mode 100644 new mode 100755 index b34ea9187..a264267f8 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -54,6 +54,7 @@ etc/rc.d/init.d/mISDN #etc/rc.d/init.d/miniupnpd #etc/rc.d/init.d/mldonkey etc/rc.d/init.d/modules +#etc/rc.d/init.d/monit #etc/rc.d/init.d/motion etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit index 7a8c5f691..5ee558ab8 100644 --- a/config/rootfiles/packages/monit +++ b/config/rootfiles/packages/monit @@ -1,7 +1,5 @@ -etc/rc.d/rc0.d/K40monit -etc/rc.d/rc3.d/S60monit -etc/rc.d/rc6.d/K40monit -etc/init.d/monit +etc/monitrc usr/bin/monit #usr/share/man/man1/monit.1 var/ipfire/backup/addons/includes/monit +etc/rc.d/init.d/monit diff --git a/lfs/initscripts b/lfs/initscripts old mode 100644 new mode 100755 diff --git a/lfs/monit b/lfs/monit index 35bb949a2..121a7a090 100644 --- a/lfs/monit +++ b/lfs/monit @@ -77,17 +77,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \ /var/ipfire/backup/addons/includes/monit - ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60monit - ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40monit - ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40monit - # Remove temporary file. - rm -vf /root/.rnd + # Install default configuration + install -v -m 644 $(DIR_SRC)/config/monit/monitrc /etc -# @rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) @$(POSTBUILD) From bd34e32e4b2ce637845cb7e7e8a2c8ede1dffe83 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Wed, 11 Jun 2014 10:54:28 +0200 Subject: [PATCH 03/10] monit addon: fixed path in init script --- src/initscripts/init.d/monit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/initscripts/init.d/monit b/src/initscripts/init.d/monit index 79cec500e..02f47e481 100644 --- a/src/initscripts/init.d/monit +++ b/src/initscripts/init.d/monit @@ -12,12 +12,12 @@ case "${1}" in start) boot_mesg "Starting monit..." - loadproc /usr/sbin/monit + loadproc /usr/bin/monit ;; stop) boot_mesg "Stopping monit..." - killproc /usr/sbin/monit + killproc /usr/bin/monit ;; restart) @@ -27,7 +27,7 @@ case "${1}" in ;; status) - statusproc /usr/sbin/monit + statusproc /usr/bin/monit ;; *) From e0eeb8a6176ab672b9dd3b3ce93f689e9a2881c3 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Sun, 15 Jun 2014 22:00:58 +0200 Subject: [PATCH 04/10] monit addon: update to 5.8.1 --- lfs/monit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/monit b/lfs/monit index 121a7a090..389ed54fe 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,7 +24,7 @@ include Config -VER = 5.8 +VER = 5.8.1 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c6873b0828f872676f9e7fe1476a8dc2 +$(DL_FILE)_MD5 = 9467328f1da0b644a766a387443db2ea install : $(TARGET) From 57865e53f70b234f2b1f1be07ed8ca8ef091664b Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Wed, 23 Jul 2014 10:30:14 +0200 Subject: [PATCH 05/10] monit addon: fixed start script links. --- config/backup/includes/monit | 2 + config/monit/monitrc | 252 +++++++++++++++++++++++++++++++++++ lfs/monit | 7 +- 3 files changed, 260 insertions(+), 1 deletion(-) create mode 100644 config/backup/includes/monit create mode 100644 config/monit/monitrc diff --git a/config/backup/includes/monit b/config/backup/includes/monit new file mode 100644 index 000000000..c25b94110 --- /dev/null +++ b/config/backup/includes/monit @@ -0,0 +1,2 @@ +/etc/monitrc +/etc/monit.d diff --git a/config/monit/monitrc b/config/monit/monitrc new file mode 100644 index 000000000..9fee14aad --- /dev/null +++ b/config/monit/monitrc @@ -0,0 +1,252 @@ +############################################################################### +## Monit control file +############################################################################### +## +## Comments begin with a '#' and extend through the end of the line. Keywords +## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'. +## +## Below you will find examples of some frequently used statements. For +## information about the control file and a complete list of statements and +## options, please have a look in the Monit manual. +## +## +############################################################################### +## Global section +############################################################################### +## +## Start Monit in the background (run as a daemon): +# +set daemon 60 # check services at 1-minute intervals +# with start delay 240 # optional: delay the first check by 4-minutes (by +# # default Monit check immediately after Monit start) +# +# +## Set syslog logging with the 'daemon' facility. If the FACILITY option is +## omitted, Monit will use 'user' facility by default. If you want to log to +## a standalone log file instead, specify the full path to the log file +# +set logfile syslog facility log_daemon +# +# +## Set the location of the Monit lock file which stores the process id of the +## running Monit instance. By default this file is stored in $HOME/.monit.pid +# +set pidfile /var/run/monit.pid +# +## Set the location of the Monit id file which stores the unique id for the +## Monit instance. The id is generated and stored on first Monit start. By +## default the file is placed in $HOME/.monit.id. +# +set idfile /var/lib/monit/id +# +## Set the location of the Monit state file which saves monitoring states +## on each cycle. By default the file is placed in $HOME/.monit.state. If +## the state file is stored on a persistent filesystem, Monit will recover +## the monitoring state across reboots. If it is on temporary filesystem, the +## state will be lost on reboot which may be convenient in some situations. +# +set statefile /var/lib/monit/state +# +## Set the list of mail servers for alert delivery. Multiple servers may be +## specified using a comma separator. If the first mail server fails, Monit +# will use the second mail server in the list and so on. By default Monit uses +# port 25 - it is possible to override this with the PORT option. +# +# set mailserver mail.bar.baz, # primary mailserver +# backup.bar.baz port 10025, # backup mailserver on port 10025 +# localhost # fallback relay +# +# +## By default Monit will drop alert events if no mail servers are available. +## If you want to keep the alerts for later delivery retry, you can use the +## EVENTQUEUE statement. The base directory where undelivered alerts will be +## stored is specified by the BASEDIR option. You can limit the queue size +## by using the SLOTS option (if omitted, the queue is limited by space +## available in the back end filesystem). +# +set eventqueue + basedir /var/lib/monit # set the base directory where events will be stored + slots 100 # optionally limit the queue size +# +# +## Send status and events to M/Monit (for more informations about M/Monit +## see http://mmonit.com/). By default Monit registers credentials with +## M/Monit so M/Monit can smoothly communicate back to Monit and you don't +## have to register Monit credentials manually in M/Monit. It is possible to +## disable credential registration using the commented out option below. +## Though, if safety is a concern we recommend instead using https when +## communicating with M/Monit and send credentials encrypted. +# +# set mmonit http://monit:monit@192.168.1.10:8080/collector +# # and register without credentials # Don't register credentials +# +# +## Monit by default uses the following format for alerts if the the mail-format +## statement is missing:: +## --8<-- +## set mail-format { +## from: monit@$HOST +## subject: monit alert -- $EVENT $SERVICE +## message: $EVENT Service $SERVICE +## Date: $DATE +## Action: $ACTION +## Host: $HOST +## Description: $DESCRIPTION +## +## Your faithful employee, +## Monit +## } +## --8<-- +## +## You can override this message format or parts of it, such as subject +## or sender using the MAIL-FORMAT statement. Macros such as $DATE, etc. +## are expanded at runtime. For example, to override the sender, use: +# +# set mail-format { from: monit@foo.bar }a +# +# +## You can set alert recipients whom will receive alerts if/when a +## service defined in this file has errors. Alerts may be restricted on +## events by using a filter as in the second example below. +# +# set alert sysadm@foo.bar # receive all alerts +## Do not alert when Monit start, stop or perform a user initiated action. +## This filter is recommended to avoid getting alerts for trivial cases +# set alert your-name@your.domain not on { instance, action } +# +# +## Monit has an embedded web server which can be used to view status of +## services monitored and manage services from a web interface. See the +## Monit Wiki if you want to enable SSL for the web server. +# +set httpd port 2812 and + use address localhost # only accept connection from localhost + allow localhost # allow localhost to connect to the server and +# allow admin:monit # require user 'admin' with password 'monit' +# allow @monit # allow users of group 'monit' to connect (rw) +# allow @users readonly # allow users of group 'users' to connect readonly + +############################################################################### +## Services +############################################################################### +## +## Check general system resources such as load average, cpu and memory +## usage. Each test specifies a resource, conditions and the action to be +## performed should a test fail. +# +# check system myhost.mydomain.tld +# if loadavg (1min) > 4 then alert +# if loadavg (5min) > 2 then alert +# if memory usage > 75% then alert +# if swap usage > 25% then alert +# if cpu usage (user) > 70% then alert +# if cpu usage (system) > 30% then alert +# if cpu usage (wait) > 20% then alert +# +# +## Check if a file exists, checksum, permissions, uid and gid. In addition +## to alert recipients in the global section, customized alert can be sent to +## additional recipients by specifying a local alert handler. The service may +## be grouped using the GROUP option. More than one group can be specified by +## repeating the 'group name' statement. +# +# check file apache_bin with path /usr/local/apache/bin/httpd +# if failed checksum and +# expect the sum 8f7f419955cefa0b33a2ba316cba3659 then unmonitor +# if failed permission 755 then unmonitor +# if failed uid root then unmonitor +# if failed gid root then unmonitor +# alert security@foo.bar on { +# checksum, permission, uid, gid, unmonitor +# } with the mail-format { subject: Alarm! } +# group server +# +# +## Check that a process is running, in this case Apache, and that it respond +## to HTTP and HTTPS requests. Check its resource usage such as cpu and memory, +## and number of children. If the process is not running, Monit will restart +## it by default. In case the service is restarted very often and the +## problem remains, it is possible to disable monitoring using the TIMEOUT +## statement. This service depends on another service (apache_bin) which +## is defined above. +# +# check process apache with pidfile /usr/local/apache/logs/httpd.pid +# start program = "/etc/init.d/httpd start" with timeout 60 seconds +# stop program = "/etc/init.d/httpd stop" +# if cpu > 60% for 2 cycles then alert +# if cpu > 80% for 5 cycles then restart +# if totalmem > 200.0 MB for 5 cycles then restart +# if children > 250 then restart +# if loadavg(5min) greater than 10 for 8 cycles then stop +# if failed host www.tildeslash.com port 80 protocol http +# and request "/somefile.html" +# then restart +# if failed port 443 type tcpssl protocol http +# with timeout 15 seconds +# then restart +# if 3 restarts within 5 cycles then timeout +# depends on apache_bin +# group server +# +# +## Check filesystem permissions, uid, gid, space and inode usage. Other services, +## such as databases, may depend on this resource and an automatically graceful +## stop may be cascaded to them before the filesystem will become full and data +## lost. +# +# check filesystem datafs with path /dev/sdb1 +# start program = "/bin/mount /data" +# stop program = "/bin/umount /data" +# if failed permission 660 then unmonitor +# if failed uid root then unmonitor +# if failed gid disk then unmonitor +# if space usage > 80% for 5 times within 15 cycles then alert +# if space usage > 99% then stop +# if inode usage > 30000 then alert +# if inode usage > 99% then stop +# group server +# +# +## Check a file's timestamp. In this example, we test if a file is older +## than 15 minutes and assume something is wrong if its not updated. Also, +## if the file size exceed a given limit, execute a script +# +# check file database with path /data/mydatabase.db +# if failed permission 700 then alert +# if failed uid data then alert +# if failed gid data then alert +# if timestamp > 15 minutes then alert +# if size > 100 MB then exec "/my/cleanup/script" as uid dba and gid dba +# +# +## Check directory permission, uid and gid. An event is triggered if the +## directory does not belong to the user with uid 0 and gid 0. In addition, +## the permissions have to match the octal description of 755 (see chmod(1)). +# +# check directory bin with path /bin +# if failed permission 755 then unmonitor +# if failed uid 0 then unmonitor +# if failed gid 0 then unmonitor +# +# +## Check a remote host availability by issuing a ping test and check the +## content of a response from a web server. Up to three pings are sent and +## connection to a port and an application level network check is performed. +# +# check host myserver with address 192.168.1.1 +# if failed icmp type echo count 3 with timeout 3 seconds then alert +# if failed port 3306 protocol mysql with timeout 15 seconds then alert +# if failed port 80 protocol http +# and request /monit/ with content = "Monit [0-9.]+ Download" +# then alert +# +# +############################################################################### +## Includes +############################################################################### +## +## It is possible to include additional configuration parts from other files or +## directories. +# +include /etc/monit.d/* +# diff --git a/lfs/monit b/lfs/monit index 389ed54fe..c736a14ed 100644 --- a/lfs/monit +++ b/lfs/monit @@ -84,8 +84,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/backup/includes/monit \ /var/ipfire/backup/addons/includes/monit - # Install default configuration + # Install default configuration install -v -m 644 $(DIR_SRC)/config/monit/monitrc /etc + # Install start links and backup include file. + ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit + ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit + ln -sf ../init.d/monit /etc/rc.d/rc6.d/K40monit + @rm -rf $(DIR_APP) @$(POSTBUILD) From c6ede545fdfbc12c10a3a66a3ea76a45e2d39ef4 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Wed, 23 Jul 2014 20:55:26 +0200 Subject: [PATCH 06/10] monit addon: fixed init.d links. --- config/rootfiles/packages/monit | 3 +++ lfs/monit | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/packages/monit b/config/rootfiles/packages/monit index 5ee558ab8..049bab351 100644 --- a/config/rootfiles/packages/monit +++ b/config/rootfiles/packages/monit @@ -3,3 +3,6 @@ usr/bin/monit #usr/share/man/man1/monit.1 var/ipfire/backup/addons/includes/monit etc/rc.d/init.d/monit +etc/rc.d/rc0.d/K40monit +etc/rc.d/rc3.d/S60monit +etc/rc.d/rc6.d/K40monit diff --git a/lfs/monit b/lfs/monit index c736a14ed..0a74f8483 100644 --- a/lfs/monit +++ b/lfs/monit @@ -85,12 +85,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/monit # Install default configuration - install -v -m 644 $(DIR_SRC)/config/monit/monitrc /etc + install -v -m 644 $(DIR_SRC)/config/monit/monitrc /etc # Install start links and backup include file. ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit ln -sf ../init.d/monit /etc/rc.d/rc6.d/K40monit - @rm -rf $(DIR_APP) +# @rm -rf $(DIR_APP) @$(POSTBUILD) From 7ce49ff07440e404959149820e507f79d7c839da Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Wed, 23 Jul 2014 21:49:52 +0200 Subject: [PATCH 07/10] monit addon: fixed monitrc permissions. --- lfs/monit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/monit b/lfs/monit index 0a74f8483..d17e77943 100644 --- a/lfs/monit +++ b/lfs/monit @@ -85,12 +85,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) /var/ipfire/backup/addons/includes/monit # Install default configuration - install -v -m 644 $(DIR_SRC)/config/monit/monitrc /etc + install -v -m 600 $(DIR_SRC)/config/monit/monitrc /etc # Install start links and backup include file. ln -sf ../init.d/monit /etc/rc.d/rc3.d/S60monit ln -sf ../init.d/monit /etc/rc.d/rc0.d/K40monit ln -sf ../init.d/monit /etc/rc.d/rc6.d/K40monit -# @rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) @$(POSTBUILD) From a61bfd61b292b28660539c8214a1edcf90d22db3 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Thu, 23 Oct 2014 18:56:58 +0200 Subject: [PATCH 08/10] monit addon: Upgrade to 5.9 --- lfs/monit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/monit b/lfs/monit index d17e77943..d1a01da50 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,7 +24,7 @@ include Config -VER = 5.8.1 +VER = 5.9 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 2 +PAK_VER = 9 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9467328f1da0b644a766a387443db2ea +$(DL_FILE)_MD5 = 808473ebbacda0c5085d7399e507bfda install : $(TARGET) From d5ea5e366c52830d4e54b89309340674fc518af2 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Sat, 25 Oct 2014 20:20:05 +0200 Subject: [PATCH 09/10] Revert "monit addon: Upgrade to 5.9" This reverts commit a61bfd61b292b28660539c8214a1edcf90d22db3. --- lfs/monit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/monit b/lfs/monit index d1a01da50..d17e77943 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,7 +24,7 @@ include Config -VER = 5.9 +VER = 5.8.1 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 9 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 808473ebbacda0c5085d7399e507bfda +$(DL_FILE)_MD5 = 9467328f1da0b644a766a387443db2ea install : $(TARGET) From 80159102fcddef6db3c778ebf1f080ebde5504c6 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Tue, 27 Jan 2015 14:11:28 +0100 Subject: [PATCH 10/10] monit addon: upgrade to 5.11 --- lfs/monit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/monit b/lfs/monit index d17e77943..6c35c6ced 100644 --- a/lfs/monit +++ b/lfs/monit @@ -24,7 +24,7 @@ include Config -VER = 5.8.1 +VER = 5.11 THISAPP = monit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = monit -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9467328f1da0b644a766a387443db2ea +$(DL_FILE)_MD5 = ff00f39d248ed7068932ed82211da9e6 install : $(TARGET)