rpms/proftpd/devel proftpd.conf,1.5,1.6 proftpd.spec,1.15,1.16

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29846

Modified Files:
	proftpd.conf proftpd.spec 
Log Message:
Comment DSO loading in config and update TLS certs paths.



Index: proftpd.conf
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- proftpd.conf	1 Aug 2005 15:17:49 -0000	1.5
+++ proftpd.conf	10 May 2006 11:29:02 -0000	1.6
@@ -77,14 +77,22 @@
 # Explained at http://www.castaglia.org/proftpd/modules/mod_tls.html
 #TLSEngine			on
 #TLSRequired			on
-#TLSRSACertificateFile		/usr/share/ssl/certs/proftpd.pem
-#TLSRSACertificateKeyFile	/usr/share/ssl/certs/proftpd.pem
+#TLSRSACertificateFile		/etc/pki/tls/certs/proftpd.pem
+#TLSRSACertificateKeyFile	/etc/pki/tls/certs/proftpd.pem
 #TLSCipherSuite			ALL:!ADH:!DES
 #TLSOptions			NoCertRequest
 #TLSVerifyClient		off
 ##TLSRenegotiate		ctrl 3600 data 512000 required off timeout 300
 #TLSLog				/var/log/proftpd/tls.log
 
+# SQL authentication Dynamic Shared Object (DSO) loading
+# See README.DSO and howto/DSO.html for more details.
+#<IfModule mod_dso.c>
+#   LoadModule mod_sql.c
+#   LoadModule mod_sql_mysql.c
+#   LoadModule mod_sql_postgres.c
+#</IfModule>
+
 # A basic anonymous configuration, with an upload directory.
 #<Anonymous ~ftp>
 #  User				ftp


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- proftpd.spec	28 Apr 2006 09:23:46 -0000	1.15
+++ proftpd.spec	10 May 2006 11:29:02 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -179,6 +179,10 @@
 
 
 %changelog
+* Wed May 10 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-3
+- Add commented section about DSO loading to the default proftpd.conf.
+- Update TLS cert paths in the default proftpd.conf to /etc/pki/tls.
+
 * Fri Apr 28 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-2
 - Mark pam.d and logrotate.d config files as noreplace.
 - Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary