Hello community, here is the log from the commit of package monit for openSUSE:Factory checked in at 2011-12-01 12:24:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monit (Old) and /work/SRC/openSUSE:Factory/.monit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "monit", Maintainer is "lmue...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/monit/monit.changes 2011-10-26 15:40:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.monit.new/monit.changes 2011-12-01 12:24:49.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Nov 30 18:05:54 UTC 2011 - pascal.ble...@opensuse.org + +- fixes to init script and configuration file for state file +- fix installation routine on >= 12.1: directories under /var/run are now + created at installation time, as /var/run is on tmpfs on >= 12.1 +- minor packaging improvements, including the use of the pristine upstream + tarball instead of a recompressed one (better traceability) + +------------------------------------------------------------------- +Fri Nov 4 11:00:25 UTC 2011 - pascal.ble...@opensuse.org + +- add some better defaults: + * set mailserver to localhost + * set alert recipient to root@localhost + * enable event queue in /var/run/monit/events + * move id and state files to /var/run/monit/ + +------------------------------------------------------------------- Old: ---- monit-5.3.1.tar.bz2 New: ---- monit-5.3.1.tar.gz monit-better_default_monitrc.patch monit-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monit.spec ++++++ --- /var/tmp/diff_new_pack.giN89l/_old 2011-12-01 12:24:50.000000000 +0100 +++ /var/tmp/diff_new_pack.giN89l/_new 2011-12-01 12:24:50.000000000 +0100 @@ -22,10 +22,11 @@ Version: 5.3.1 Release: 1 Summary: Service Manager and Monitor System -# http://mmonit.com/monit/dist/monit-%{version}.tar.gz -Source: monit-%{version}.tar.bz2 +Source: http://mmonit.com/monit/dist/monit-%{version}.tar.gz Source1: monit-vendor-files.tar.gz Patch1: monit-page_shift.patch +Patch2: monit-better_default_monitrc.patch +Source99: monit-rpmlintrc Url: http://mmonit.com/monit/download/ Group: System/Monitoring License: GNU General Public License (GPL) @@ -76,6 +77,7 @@ %prep %setup -q -a1 %patch1 +%patch2 find doc/ -type f -size 0 -exec %__rm {} \; @@ -96,8 +98,11 @@ "%{buildroot}%{_datadir}/monit" \ "%{buildroot}%{_var}/adm/fillup-templates" \ "%{buildroot}%{_var}/run/monit" \ + "%{buildroot}%{_var}/run/monit/events" \ "%{buildroot}%{_var}/lib/monit" +touch "%{buildroot}%{_var}/run/monit/.monit.id" + . vendor-files/sysconfig/monit.tmpl MONIT_BIN="%{_bindir}/monit" MONIT_MODIFY_INITTAB="%{_datadir}/monit/monit-modifyinittab" @@ -148,6 +153,8 @@ %post %{fillup_and_insserv} +%__install -d -m0700 -o root -g root %{_var}/run/monit +%__install -d -m0700 -o root -g root %{_var}/run/monit/events %preun %{stop_on_removal monit} @@ -157,7 +164,7 @@ %{insserv_cleanup} %clean -%__rm -rf "%{buildroot}" +%{?buildroot:%__rm -rf "%{buildroot}"} %files -f doc.main.lst %defattr(-,root,root) @@ -175,6 +182,8 @@ %ghost %dir %{_var}/run/monit %ghost %{_var}/run/monit/monit.pid %ghost %{_var}/run/monit/monit.state +%ghost %{_var}/run/monit/.monit.id +%ghost %dir %{_var}/run/monit/events %doc %{_mandir}/man1/monit.1%{ext_man} %files doc -f doc.doc.lst ++++++ monit-better_default_monitrc.patch ++++++ --- monitrc.orig 2011-11-04 11:54:04.674000463 +0100 +++ monitrc 2011-11-04 11:56:10.848000463 +0100 @@ -24,24 +24,24 @@ ## 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 logfile syslog facility log_daemon + # ## 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/.monit.id -# + +set idfile /var/run/monit/.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/.monit.state -# + +set statefile /var/run/monit/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 @@ -50,7 +50,9 @@ # set mailserver mail.bar.baz, # primary mailserver # backup.bar.baz port 10025, # backup mailserver on port 10025 # localhost # fallback relay -# + +set mailserver localhost + # ## 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 @@ -62,7 +64,11 @@ # set eventqueue # basedir /var/monit # set the base directory where events will be stored # slots 100 # optionally limit the queue size -# + +set eventqueue + basedir /var/run/monit/events + slots 100 + # ## Send status and events to M/Monit (for more informations about M/Monit ## see http://mmonit.com/). By default Monit registers credentials with @@ -98,7 +104,9 @@ ## are expanded at runtime. For example, to override the sender, use: # # set mail-format { from: mo...@foo.bar } -# + +set mail-format { from: monit@localhost } + # ## You can set alert recipients whom will receive alerts if/when a ## service defined in this file has errors. Alerts may be restricted on @@ -107,6 +115,9 @@ # set alert sys...@foo.bar # receive all alerts # set alert mana...@foo.bar only on { timeout } # receive just service- # # timeout alert + +set alert root@localhost + # # ## Monit has an embedded web server which can be used to view status of ++++++ monit-rpmlintrc ++++++ addFilter("hidden-file-or-dir /var/run/monit/.monit.id") addFilter("no-manual-page-for-binary rcmonit") ++++++ monit-vendor-files.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/monit.tmpl new/vendor-files/init/monit.tmpl --- old/vendor-files/init/monit.tmpl 2010-09-24 00:29:25.000000000 +0200 +++ new/vendor-files/init/monit.tmpl 2011-11-30 19:00:33.000000000 +0100 @@ -22,7 +22,6 @@ MONIT_BIN="__MONIT_BIN__" MONIT_MODIFY_INITTAB="__MONIT_MODIFY_INITTAB__" MONIT_PID_FILE="__MONIT_PID_FILE__" -MONIT_SUBSYS_FILE="/var/lock/subsys/monit" MONIT_SYSCONFIG_FILE="__MONIT_SYSCONFIG_FILE__" # Status shell functions @@ -86,7 +85,6 @@ startproc -p "${MONIT_PID_FILE}" "${MONIT_BIN}" -c "${MONIT_RC_FILE}" ${MONIT_ARGS} fi rc_status -v - test $? -eq 0 && touch "${MONIT_SUBSYS_FILE}" ;; stop) echo -n "Shutting down monit " @@ -99,7 +97,6 @@ killproc -p "${MONIT_PID_FILE}" "${MONIT_BIN}" fi rc_status -v - test $? -eq 0 && rm -f "${MONIT_SUBSYS_FILE}" ;; status) echo -n "Checking for service monit " @@ -134,13 +131,11 @@ echo -n "Reload service monit " killproc -p "${MONIT_PID_FILE}" -HUP "${MONIT_BIN}" rc_status -v - test $? -eq 0 && touch "${MONIT_SUBSYS_FILE}" ;; poll) echo -n "Poll all monit services " killproc -p "${MONIT_PID_FILE}" -SIGUSR1 "${MONIT_BIN}" rc_status -v - test $? -eq 0 && touch "${MONIT_SUBSYS_FILE}" ;; *) echo "Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload|poll}" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
