From b794a81bae95ec58f560353f5226323529bae7e0 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Mon, 5 Sep 2011 15:15:42 +0200 Subject: [PATCH] Rename de.barton.nagcollect to de.barton.nagcollect.plist The file extension ".plist" is required for LaunchDaemon configuration files, so rename de.barton.nagcollect to de.barton.nagcollect.plist. But we have to handle the old name as well to ease upgrades ... --- ...on.nagcollect => de.barton.nagcollect.plist} | 0 contrib/Makefile.Darwin | 17 ++++++++++++----- contrib/NagCollect.pmdoc/04de.xml | 2 +- contrib/launch-osx.sh | 6 ++++-- contrib/setup-osx.sh | 6 +++++- 5 files changed, 22 insertions(+), 9 deletions(-) rename client/lib/{de.barton.nagcollect => de.barton.nagcollect.plist} (100%) diff --git a/client/lib/de.barton.nagcollect b/client/lib/de.barton.nagcollect.plist similarity index 100% rename from client/lib/de.barton.nagcollect rename to client/lib/de.barton.nagcollect.plist diff --git a/contrib/Makefile.Darwin b/contrib/Makefile.Darwin index cc516d5..f82cbd2 100644 --- a/contrib/Makefile.Darwin +++ b/contrib/Makefile.Darwin @@ -1,16 +1,23 @@ # # NagCollect -- Nagios Data Collector for Passive Checks -# Copyright (c)2009 Alexander Barton, alex@barton.de +# Copyright (c)2009,2011 Alexander Barton, alex@barton.de # install-client: [ -r /Library/LaunchDaemons/de.barton.nagcollect ] \ - && launchctl unload -w /Library/LaunchDaemons/de.barton.nagcollect \ + && launchctl unload -w \ + /Library/LaunchDaemons/de.barton.nagcollect \ || true + rm -f /Library/LaunchDaemons/de.barton.nagcollect + [ -r /Library/LaunchDaemons/de.barton.nagcollect.plist ] \ + && launchctl unload -w \ + /Library/LaunchDaemons/de.barton.nagcollect.plist \ + || true + rm -f /Library/LaunchDaemons/de.barton.nagcollect.plist install -d -o 0 -g 0 -m 755 /Library/LaunchDaemons - install -c -o 0 -g 0 -m 644 -p client/lib/de.barton.nagcollect \ - /Library/LaunchDaemons/de.barton.nagcollect - launchctl load -w /Library/LaunchDaemons/de.barton.nagcollect + install -c -o 0 -g 0 -m 644 -p client/lib/de.barton.nagcollect.plist \ + /Library/LaunchDaemons/de.barton.nagcollect.plist + launchctl load -w /Library/LaunchDaemons/de.barton.nagcollect.plist .PHONY: install-client diff --git a/contrib/NagCollect.pmdoc/04de.xml b/contrib/NagCollect.pmdoc/04de.xml index ada35b5..4b3f53a 100644 --- a/contrib/NagCollect.pmdoc/04de.xml +++ b/contrib/NagCollect.pmdoc/04de.xml @@ -1 +1 @@ -de.barton.nagcollectClient.launchscript.pkg1../client/lib/de.barton.nagcollect/Library/LaunchDaemonsscripts.preinstall.pathscripts.postflight.pathinstallToscripts.postinstall.pathscripts.preflight.isRelativeTypeinstallFrom.isRelativeTypescripts.postflight.isRelativeTypeversionparentscripts.preupgrade.pathidentifierscripts.postupgrade.pathrequireAuthorizationscripts.preflight.pathextraFilesinstallTo.pathsetup-osx.shlaunch-osx.shsetup-osx.shlaunch-osx.sh04de-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file +de.barton.nagcollectClient.launchscript.pkg1../client/lib/de.barton.nagcollect.plist/Library/LaunchDaemonsscripts.preinstall.pathscripts.postflight.pathinstallToscripts.postinstall.pathscripts.preflight.isRelativeTypeinstallFrom.isRelativeTypescripts.postflight.isRelativeTypeversionparentscripts.preupgrade.pathidentifierscripts.postupgrade.pathrequireAuthorizationscripts.preflight.pathextraFilesinstallTo.pathsetup-osx.shlaunch-osx.shsetup-osx.shlaunch-osx.sh04de-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ diff --git a/contrib/launch-osx.sh b/contrib/launch-osx.sh index dd75800..75f0802 100755 --- a/contrib/launch-osx.sh +++ b/contrib/launch-osx.sh @@ -1,13 +1,15 @@ #!/bin/sh # # NagCollect -- Nagios Data Collector for Passive Checks -# Copyright (c)2009 Alexander Barton, alex@barton.de +# Copyright (c)2009,2011 Alexander Barton, alex@barton.de # logger -t "launch-osx.sh" -s "starting ..." [ -r /usr/local/etc/nagcollect.conf ] && . /usr/local/etc/nagcollect.conf if [ -n "$SERVER_URL" -a -n "$CLIENT_KEY" -a -n "$CLIENT_ID" ]; then logger -t "launch-osx.sh" -s "Configuration valid, loading LaunchDaemon script ..." - launchctl load -w /Library/LaunchDaemons/de.barton.nagcollect + chown root:wheel /Library/LaunchDaemons/de.barton.nagcollect.plist + chmod 644 /Library/LaunchDaemons/de.barton.nagcollect.plist + launchctl load -w /Library/LaunchDaemons/de.barton.nagcollect.plist else logger -t "launch-osx.sh" -s "Configuration not valid, NOT LOADING LaunchDaemon script!" fi diff --git a/contrib/setup-osx.sh b/contrib/setup-osx.sh index 98db928..9e8bcc6 100755 --- a/contrib/setup-osx.sh +++ b/contrib/setup-osx.sh @@ -1,9 +1,13 @@ #!/bin/sh # # NagCollect -- Nagios Data Collector for Passive Checks -# Copyright (c)2009 Alexander Barton, alex@barton.de +# Copyright (c)2009,2011 Alexander Barton, alex@barton.de # logger -t "setup-osx.sh" -s "starting ..." [ -r /Library/LaunchDaemons/de.barton.nagcollect ] \ && launchctl unload -w /Library/LaunchDaemons/de.barton.nagcollect +rm -f /Library/LaunchDaemons/de.barton.nagcollect +[ -r /Library/LaunchDaemons/de.barton.nagcollect.plist ] \ + && launchctl unload -w /Library/LaunchDaemons/de.barton.nagcollect.plist +rm -f /Library/LaunchDaemons/de.barton.nagcollect.plist logger -t "setup-osx.sh" -s "done." -- 2.39.2