From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 27 Mar 2019 19:38:22 +0000 (+0100)
Subject: - rel 4; support alternative config locations
X-Git-Tag: auto/th/pure-ftpd-1.0.48-4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=66b655748335288d2276b6dac6f014b302e84d6b;p=packages%2Fpure-ftpd.git

- rel 4; support alternative config locations
---

diff --git a/pure-ftpd.init b/pure-ftpd.init
index f33c263..d032e8a 100644
--- 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 423b2cb..e54f0e9 100644
--- 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