[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-22-g9021e4f

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 0f3fa4b7e0ee284368f380848792cf218d488568
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Feb 18 19:15:53 2011 +0100

    Closing  #613527

diff --git a/debian/changelog b/debian/changelog
index 596b3f6..5fc4718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ proftpd-dfsg (1.3.3d-4) unstable; urgency=low
   * [PATCH] silent remove excessive verbosity at startup about conf.d
     directory parsing.
   * Updated debian/NEWS file with information about new conf.d directory.
+  * Now configuration file name can be overriden at run-time.
+    (closes: #613527)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:31:52 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 18 Feb 2011 19:14:56 +0100
 
 proftpd-dfsg (1.3.3d-3) unstable; urgency=low
 
diff --git a/debian/proftpd-basic.init b/debian/proftpd-basic.init
index 6fc94b8..ab19b20 100644
--- a/debian/proftpd-basic.init
+++ b/debian/proftpd-basic.init
@@ -22,8 +22,9 @@ NAME=proftpd
 # Defaults
 RUN="no"
 OPTIONS=""
+CONFIG_FILE=/etc/proftpd/proftpd.conf
 
-PIDFILE=`grep -i 'pidfile' /etc/proftpd/proftpd.conf | sed -e 's/pidfile[\t ]\+//i'`
+PIDFILE=`grep -i 'pidfile' $CONFIG_FILE|sed -e 's/pidfile[\t ]\+//i'`
 if [ "x$PIDFILE" = "x" ];
 then
 	PIDFILE=/var/run/proftpd.pid
@@ -43,7 +44,7 @@ test -f $DAEMON || exit 0
 # Servertype could be inetd|standalone|none.
 # In all cases check against inetd and xinetd support.
 #
-if ! egrep -qi "^[[:space:]]*ServerType.*standalone" /etc/proftpd/proftpd.conf
+if ! egrep -qi "^[[:space:]]*ServerType.*standalone" $CONFIG_FILE
 then
 	if egrep -qi "server[[:space:]]*=[[:space:]]*/usr/sbin/proftpd" /etc/xinetd.conf 2>/dev/null || \
 	   egrep -qi "server[[:space:]]*=[[:space:]]*/usr/sbin/proftpd" /etc/xinetd.d/* 2>/dev/null || \
@@ -52,7 +53,7 @@ then
     		RUN="no"
     		INETD="yes"
 	else
-		if ! egrep -qi "^[[:space:]]*ServerType.*inetd" /etc/proftpd/proftpd.conf
+		if ! egrep -qi "^[[:space:]]*ServerType.*inetd" $CONFIG_FILE
 		then
     		RUN="yes"
 			INETD="no"
@@ -78,7 +79,7 @@ start()
 {
     log_daemon_msg "Starting ftp server" "$NAME"
 
-    start-stop-daemon --start --quiet --pidfile "$PIDFILE" --oknodo --exec $DAEMON -- $OPTIONS  
+    start-stop-daemon --start --quiet --pidfile "$PIDFILE" --oknodo --exec $DAEMON -- -c $CONFIG_FILE $OPTIONS  
     if [ $? != 0 ]; then
         log_end_msg 1
         exit 1
diff --git a/debian/templates/default b/debian/templates/default
index b31f36c..e6734cd 100644
--- a/debian/templates/default
+++ b/debian/templates/default
@@ -1,5 +1,8 @@
 # Defaults for proftpd initscript
 
+# Main configuration file
+CONFIG_FILE=/etc/proftpd/proftpd.conf
+
 # Master system-wide proftpd switch. The initscript
 # will not run if it is not set to yes.
 RUN="yes"

-- 
ProFTPD core package