diff -Naur proftpd-1.3.3/sample-configurations/anonymous.conf proftpd-1.3.3-magellan/sample-configurations/anonymous.conf
--- proftpd-1.3.3/sample-configurations/anonymous.conf 2010-03-03 19:16:25.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/anonymous.conf 2010-03-03 19:35:28.000000000 +0100
@@ -52,6 +52,27 @@
TransferLog /var/log/proftpd/xferlog
SystemLog /var/log/proftpd/proftpd.log
+# TLS support (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+# Generate the certificate as follows:
+# openssl req -new -x509 -days 365 -nodes \
+# -out /etc/ssl/certs/proftpd.cert.pem \
+# -keyout /etc/ssl/certs/proftpd.key.pem
+#
+
+ TLSEngine on
+ TLSRequired on
+ TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem
+ TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem
+ TLSCipherSuite ALL:!ADH:!DES
+ TLSOptions NoCertRequest
+ TLSVerifyClient off
+ #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300
+ TLSLog /var/log/proftpd/tls.log
+
+ TLSSessionCache shm:/file=/var/run/proftpd/sesscache
+
+
+
# Our "basic" anonymous configuration, including a single
# upload directory ("uploads")
diff -Naur proftpd-1.3.3/sample-configurations/basic.conf proftpd-1.3.3-magellan/sample-configurations/basic.conf
--- proftpd-1.3.3/sample-configurations/basic.conf 2010-03-03 19:16:25.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/basic.conf 2010-03-03 19:35:48.000000000 +0100
@@ -53,6 +53,27 @@
TransferLog /var/log/proftpd/xferlog
SystemLog /var/log/proftpd/proftpd.log
+# TLS support (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+# Generate the certificate as follows:
+# openssl req -new -x509 -days 365 -nodes \
+# -out /etc/ssl/certs/proftpd.cert.pem \
+# -keyout /etc/ssl/certs/proftpd.key.pem
+#
+
+ TLSEngine on
+ TLSRequired on
+ TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem
+ TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem
+ TLSCipherSuite ALL:!ADH:!DES
+ TLSOptions NoCertRequest
+ TLSVerifyClient off
+ #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300
+ TLSLog /var/log/proftpd/tls.log
+
+ TLSSessionCache shm:/file=/var/run/proftpd/sesscache
+
+
+
# A basic anonymous configuration, no upload directories.
#
diff -Naur proftpd-1.3.3/sample-configurations/mod_sql.conf proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf
--- proftpd-1.3.3/sample-configurations/mod_sql.conf 2010-03-03 19:16:25.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/mod_sql.conf 2010-03-03 19:36:29.000000000 +0100
@@ -83,6 +83,27 @@
# (second param) from being group and world writable.
Umask 022 022
+# TLS support (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+# Generate the certificate as follows:
+# openssl req -new -x509 -days 365 -nodes \
+# -out /etc/ssl/certs/proftpd.cert.pem \
+# -keyout /etc/ssl/certs/proftpd.key.pem
+#
+
+ TLSEngine on
+ TLSRequired on
+ TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem
+ TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem
+ TLSCipherSuite ALL:!ADH:!DES
+ TLSOptions NoCertRequest
+ TLSVerifyClient off
+ #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300
+ TLSLog /var/log/proftpd/tls.log
+
+ TLSSessionCache shm:/file=/var/run/proftpd/sesscache
+
+
+
# We put our mod_sql directives in a block so they'll be
# inherited by the block below, and any other
# blocks we may want to add. For a simple server these don't need to
diff -Naur proftpd-1.3.3/sample-configurations/virtual.conf proftpd-1.3.3-magellan/sample-configurations/virtual.conf
--- proftpd-1.3.3/sample-configurations/virtual.conf 2010-03-03 19:16:25.000000000 +0100
+++ proftpd-1.3.3-magellan/sample-configurations/virtual.conf 2010-03-03 19:36:53.000000000 +0100
@@ -48,6 +48,27 @@
TransferLog /var/log/proftpd/xferlog
SystemLog /var/log/proftpd/proftpd.log
+# TLS support (http://www.castaglia.org/proftpd/modules/mod_tls.html)
+# Generate the certificate as follows:
+# openssl req -new -x509 -days 365 -nodes \
+# -out /etc/ssl/certs/proftpd.cert.pem \
+# -keyout /etc/ssl/certs/proftpd.key.pem
+#
+
+ TLSEngine on
+ TLSRequired on
+ TLSRSACertificateFile /etc/ssl/certs/proftpd.cert.pem
+ TLSRSACertificateKeyFile /etc/ssl/certs/proftpd.key.pem
+ TLSCipherSuite ALL:!ADH:!DES
+ TLSOptions NoCertRequest
+ TLSVerifyClient off
+ #TLSRenegotiate ctrl 3600 data 512000 required off timeout 300
+ TLSLog /var/log/proftpd/tls.log
+
+ TLSSessionCache shm:/file=/var/run/proftpd/sesscache
+
+
+
# First virtual server
ServerName "Virtual.com's FTP Server"