- removed duplicate setup

[packages/pure-ftpd.git] / pure-ftpd.init

diff --git a/pure-ftpd.init b/pure-ftpd.init
index b9c175ae166390455958aea216b828a853891655..9755edd485f7cd12f4fea45f6f9d18c93e843f8c 100644 (file)
--- a/pure-ftpd.init
+++ b/pure-ftpd.init
@@ -15,9 +15,21 @@
 # Get service config
 [ -f /etc/sysconfig/pure-ftpd ] && . /etc/sysconfig/pure-ftpd
 
+# Check for available parsers
+if [ -x /usr/sbin/pure-config ] ; then
+       CFG=/usr/sbin/pure-config
+elif [ -x /usr/sbin/pure-config.pl -a -x /usr/bin/perl ] ; then 
+       CFG=/usr/sbin/pure-config.pl
+elif [ -x /usr/sbin/pure-config.py -a -x /usr/bin/python ] ; then
+       CFG=/usr/sbin/pure-config.py
+else
+       echo 'Error: pure-config{.pl,py} not found. Giving up.'
+       exit 1
+fi     
+
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network ]; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                # nls "ERROR: Networking is down. %s can't be run." <service>
                msg_network_down pure-ftpd
                exit 1
@@ -34,8 +46,15 @@ case "$1" in
        if [ ! -f /var/lock/subsys/pure-ftpd ]; then
                msg_starting pure-ftpd
                rm -f /var/run/pure-ftpd/client*
-               daemon pure-config.pl /etc/ftpd/pureftpd.conf --daemonize
-               RETVAL=$?
+               if [ x"$CFG" = "x/usr/sbin/pure-config" ] ; then
+                       daemon /usr/sbin/pure-ftpd \
+                               $(/usr/sbin/pure-config -f /etc/ftpd/pureftpd.conf) \
+                               --daemonize
+                       RETVAL=$?
+               else
+                       daemon $CFG /etc/ftpd/pureftpd.conf --daemonize
+                       RETVAL=$?
+               fi
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pure-ftpd
        else
                msg_already_running pure-ftpd