- update for 1.2.9rc1

Changed files:
    proftpd.conf -> 1.10

diff --git a/proftpd.conf b/proftpd.conf
index 731ac6cec5733e89964c20ea559ca4a43c9c7977..6e666cd8c3c25331e0e3d200e161b32827fc3136 100644 (file)
--- a/proftpd.conf
+++ b/proftpd.conf
@@ -4,30 +4,44 @@
 # "nobody" and "ftp" for normal operation and anon.
 
 ServerName                     "ProFTPD"
+ServerIdent                    off
 ServerType                     inetd
 DeferWelcome                   off
 DefaultServer                  on
 
-<Global>
-       # Set this to "on" if you are running in standalone mode!
-       UseTCPD                 off
-       TCPDServiceName         ftp
-</Global>
-
 # If you want .message files to work with browsers, you probably
 # want to uncomment the next line
 #MultilineRFC2228              on
 
+# TCPD configuration
+TCPServiceName                 ftp
+#TCPAccessFiles                        None
+#TCPAccessSyslogLevels         info warn
+#TCPGroupAccessFiles           None
+#TCPUserAccessFiles            None
+
 # These are the TLS related options, default values
-#TlsRsaCertFile                        ftpd-rsa.pem
-#TlsRsaKeyFile                 ftpd-rsa-key.pem
-#TlsDsaCertFile                        ftpd-dsa.pem
-#TlsDsaKeyFile                 ftpd-dsa-key.pem
-#TlsCrlFile                    ftpd-crl.pem
-#TlsDhParamFile                        ftpd-dhparam.pem
-#TlsCipherList                 ALL:!EXP
-# don't verify any peer certificates
-#TlsCertsOk                    off
+#TLSEngine                     off
+#TLSProtocol                   SSLv23
+#TLSCipherSuite                        ALL:!ADH
+#TLSRSACertificateFile         None
+#TLSRSACertificateKeyFile      None
+#TLSDSACertficateFile          None
+#TLSDSACertificateKeyFile      None
+#TLSCACertificateFile          None
+#TLSCACertificatePath          None
+#TLSCARevocationFile           None
+#TLSCARevocationPath           None
+#TLSCertificateChainFile       None
+#TLSDHParamFile                        None
+#TLSLog                                None
+#TLSOptions                    None
+#TLSRandomSeed                 openssl-dir/.rnd
+#TLSRenegotiate                        None
+#TLSRequired                   None
+#TLSTimeoutHandshake           300
+#TLSVerifyClient               None
+#TLSVerifyDepth                        9
 
 # Port 21 is the standard FTP port.
 Port                           21