From: Alexander Barton <alex@barton.de>
Date: Mon, 5 Sep 2011 13:15:42 +0000 (+0200)
Subject: Rename de.barton.nagcollect to de.barton.nagcollect.plist
X-Git-Tag: rel-3~12
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=commitdiff_plain;h=b794a81bae95ec58f560353f5226323529bae7e0;ds=sidebyside

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 ...
---

diff --git a/client/lib/de.barton.nagcollect b/client/lib/de.barton.nagcollect
deleted file mode 100644
index 2ce97e5..0000000
--- a/client/lib/de.barton.nagcollect
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>Label</key>
-	<string>de.barton.nagcollect</string>
-	<key>Program</key>
-	<string>/usr/local/sbin/nagcollect</string>
-	<key>Nice</key>
-	<integer>5</integer>
-	<key>RunAtLoad</key>
-	<true/>
-	<key>StartInterval</key>
-	<integer>900</integer>
-</dict>
-</plist>
diff --git a/client/lib/de.barton.nagcollect.plist b/client/lib/de.barton.nagcollect.plist
new file mode 100644
index 0000000..2ce97e5
--- /dev/null
+++ b/client/lib/de.barton.nagcollect.plist
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>de.barton.nagcollect</string>
+	<key>Program</key>
+	<string>/usr/local/sbin/nagcollect</string>
+	<key>Nice</key>
+	<integer>5</integer>
+	<key>RunAtLoad</key>
+	<true/>
+	<key>StartInterval</key>
+	<integer>900</integer>
+</dict>
+</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 @@
-<pkgref spec="1.12" uuid="93FCFF65-282E-4131-B4AC-6FC1345FF6F8"><config><identifier>de.barton.nagcollectClient.launchscript.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/lib/de.barton.nagcollect</installFrom><installTo mod="true">/Library/LaunchDaemons</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preinstall.path</mod><mod>scripts.postflight.path</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>scripts.preflight.isRelativeType</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postflight.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.preupgrade.path</mod><mod>identifier</mod><mod>scripts.postupgrade.path</mod><mod>requireAuthorization</mod><mod>scripts.preflight.path</mod><mod>extraFiles</mod><mod>installTo.path</mod></config><scripts><preinstall relative="true" mod="true">setup-osx.sh</preinstall><postinstall relative="true" mod="true">launch-osx.sh</postinstall><preupgrade relative="true" mod="true">setup-osx.sh</preupgrade><postupgrade relative="true" mod="true">launch-osx.sh</postupgrade></scripts><contents><file-list>04de-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="93FCFF65-282E-4131-B4AC-6FC1345FF6F8"><config><identifier>de.barton.nagcollectClient.launchscript.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../client/lib/de.barton.nagcollect.plist</installFrom><installTo mod="true">/Library/LaunchDaemons</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preinstall.path</mod><mod>scripts.postflight.path</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>scripts.preflight.isRelativeType</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postflight.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.preupgrade.path</mod><mod>identifier</mod><mod>scripts.postupgrade.path</mod><mod>requireAuthorization</mod><mod>scripts.preflight.path</mod><mod>extraFiles</mod><mod>installTo.path</mod></config><scripts><preinstall relative="true" mod="true">setup-osx.sh</preinstall><postinstall relative="true" mod="true">launch-osx.sh</postinstall><preupgrade relative="true" mod="true">setup-osx.sh</preupgrade><postupgrade relative="true" mod="true">launch-osx.sh</postupgrade></scripts><contents><file-list>04de-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
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."