- rel 3; keep scripts in new /etc/pure-ftpd directory structure; fix issues with...

diff --git a/pure-ftpd.init b/pure-ftpd.init
index fab402e98d5b2c5bb1ad72b40d2da689b335fa62..a34fdbae4d7efed717141824a51c1da58efdf7f1 100644 (file)
--- a/pure-ftpd.init
+++ b/pure-ftpd.init
@@ -12,9 +12,9 @@
 # Get network config
 . /etc/sysconfig/network
 
-PURE_AUTH_SCRIPT=/etc/ftpd/auth.script
+PURE_AUTH_SCRIPT=/etc/pure-ftpd/authd/auth.script
 PURE_AUTH_SOCKET=/var/run/pure-authd/socket
-PURE_CERT_SCRIPT=/etc/ftpd/cert.script
+PURE_CERT_SCRIPT=/etc/pure-ftpd/certd/cert.script
 PURE_CERT_SOCKET=/var/run/pure-certd/socket
 
 # Get service config
@@ -70,7 +70,7 @@ start() {
                        modprobe -s capability > /dev/null 2>&1
                        daemon /usr/sbin/pure-ftpd /etc/ftpd/pureftpd.conf \
                                $([ "$PURE_AUTH" = "yes" ] && echo "-lextauth:$PURE_AUTH_SOCKET") \
-                               $([ "$PURE_CERT" = "yes" ] && echo "-lextcert:$PURE_CERT_SOCKET") \
+                               $([ "$PURE_CERT" = "yes" ] && echo "--extcert=$PURE_CERT_SOCKET") \
                                --daemonize
                        RETVAL=$?
 

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 70e72ddf0ae984d42090c08913567f532ae33555..423b2cbf821bf80da054dc76efe133da5bf362d6 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     2
+%define        rel     3
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd
@@ -128,6 +128,7 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 %{__automake}
 %configure \
        CFLAGS="%{rpmcflags} %{rpmcppflags} -DALLOW_DELETION_OF_TEMPORARY_FILES=1 -DALWAYS_SHOW_RESOLVED_SYMLINKS=1" \
+       --disable-silent-rules \
        --with-boring \
        --with-altlog \
        --with-cookie \
@@ -164,7 +165,7 @@ cd pure-config
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,sysconfig,security,rc.d/init.d} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,sysconfig,security,rc.d/init.d,%{name}/{certd,authd,conf}} \
        $RPM_BUILD_ROOT{%{_sysconfdir}/vhosts,%{_ftpdir},%{schemadir}}
 
 %{__make} install \
@@ -244,6 +245,11 @@ exit 0
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
+%attr(751,root,root) %config(noreplace) %verify(not md5 mtime size) %dir /etc/%{name}
+%attr(750,root,ftpauth) %config(noreplace) %verify(not md5 mtime size) %dir /etc/%{name}/authd
+%attr(750,root,ftpcert) %config(noreplace) %verify(not md5 mtime size) %dir /etc/%{name}/certd
+# for future /etc/ftpd -> /etc/pure-ftpd/conf migration
+#%attr(750,root,ftpcert) %config(noreplace) %verify(not md5 mtime size) %dir /etc/%{name}/conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ftpusers
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pureftpd-dir-aliases
 %{?with_ldap:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pureftpd-ldap.conf}

diff --git a/pure-ftpd.sysconfig b/pure-ftpd.sysconfig
index ada2fda4f43310810cea7e9d15c5927f4c79607b..e6fa77ab40def65d100ec5f8207214756127280d 100644 (file)
--- a/pure-ftpd.sysconfig
+++ b/pure-ftpd.sysconfig
@@ -1,7 +1,10 @@
 # Customized settings for pure-ftpd
 
 # Own authorization script, see README.Authentication-Modules
-# PURE_AUTH_SCRIPT=/etc/ftpd/auth.script
+# PURE_AUTH_SCRIPT=/etc/pure-ftpd/authd/auth.script
+
+# Own certs provider script, see README.TLS
+# PURE_CERT_SCRIPT=/etc/pure-ftpd/certd/cert.script
 
 # If it is set and 'CallUploadScript' option is used in configuration file
 # this script is called after successfull file upload.