[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.3-1-12-ge1f3d7e

[Alexander Wirt]

The following commit has been merged in the master branch:
commit e1f3d7ead36f42de031ac30aff86bd8ec8b9a978
Author: Alexander Wirt <alexander.wirt at credativ.de>
Date:   Tue Feb 26 10:24:13 2013 +0100

    Fix default file handling

diff --git a/debian/nsca-ng-server.default b/debian/nsca-ng-server.default
index 53aaa52..479d056 100644
--- a/debian/nsca-ng-server.default
+++ b/debian/nsca-ng-server.default
@@ -4,4 +4,4 @@
 # how to get nsca-ng working
 
 # start nsca-ng daemon (no/yes)
-NSCA-NG=no
+NSCA_NG=no
diff --git a/debian/nsca-ng-server.init b/debian/nsca-ng-server.init
index 21317fa..75d9860 100644
--- a/debian/nsca-ng-server.init
+++ b/debian/nsca-ng-server.init
@@ -27,7 +27,7 @@ CFGFILE="/etc/nsca-ng/nsca-ng.cfg"
 [ -x "$DAEMON" ] || exit 0
 
 # Read configuration variable file if it is present.
-[ -r "/etc/default/$NAME" ] && . "/etc/default/$NAME"
+[ -r "/etc/default/${NAME}-server" ] && . "/etc/default/${NAME}-server"
 
 # Define LSB log_* functions.
 . '/lib/lsb/init-functions'
@@ -35,7 +35,7 @@ CFGFILE="/etc/nsca-ng/nsca-ng.cfg"
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 
-if [ "$NSCA-NG" != "yes"  ]; then
+if [ "${NSCA_NG}" != "yes"  ]; then
 	log_warning_msg "Not starting nsca-ng - edit /etc/default/nsca-ng-server to enable it"
 	exit 0
 fi

-- 
UNNAMED PROJECT