- rel 4; support alternative config locations

diff --git a/pure-ftpd.init b/pure-ftpd.init
index f33c263aa199fc75df222145de00c16447bd4588..d032e8a13988c64aa656118042c65ddfd8d9ecc7 100644 (file)
--- a/pure-ftpd.init
+++ b/pure-ftpd.init
@@ -12,6 +12,9 @@
 # Get network config
 . /etc/sysconfig/network
 
+PURE_FTPD_CONF=/etc/ftpd/pureftpd.conf
+[ -f /etc/pure-ftpd/conf/pureftpd.conf ] && PURE_FTPD_CONF=/etc/pure-ftpd/conf/pureftpd.conf
+
 PURE_AUTH_SCRIPT=/etc/pure-ftpd/authd/auth.script
 PURE_AUTH_SOCKET=/var/run/pure-authd/socket
 PURE_CERT_SCRIPT=/etc/pure-ftpd/certd/cert.script
@@ -68,7 +71,7 @@ start() {
                        msg_starting pure-ftpd
                        rm -f /var/run/pure-ftpd/client*
                        modprobe -s capability > /dev/null 2>&1
-                       daemon /usr/sbin/pure-ftpd /etc/ftpd/pureftpd.conf \
+                       daemon /usr/sbin/pure-ftpd ${PURE_FTPD_CONF} \
                                $([ "$PURE_AUTH" = "yes" ] && echo "-lextauth:$PURE_AUTH_SOCKET") \
                                $([ "$PURE_CERT" = "yes" ] && echo "--extcert=$PURE_CERT_SOCKET") \
                                --daemonize

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 423b2cbf821bf80da054dc76efe133da5bf362d6..e54f0e9af37459f07f881bf3de7d4635b0188c77 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without tls             # disable SSL/TLS support
 %bcond_without cap             # disable capabilities
 
-%define        rel     3
+%define        rel     4
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd