[packages/pure-ftpd] - rel 4; support alternative config locations

[arekm]

commit 66b655748335288d2276b6dac6f014b302e84d6b
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Wed Mar 27 20:38:22 2019 +0100

    - rel 4; support alternative config locations

 pure-ftpd.init | 5 ++++-
 pure-ftpd.spec | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
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
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pure-ftpd.git/commitdiff/66b655748335288d2276b6dac6f014b302e84d6b

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit