diff --git a/proftpd-tls.template b/proftpd-tls.template index 1b58afd..3127027 100644 --- a/proftpd-tls.template +++ b/proftpd-tls.template @@ -7,19 +7,19 @@ - TLSEngine on - TLSLog /var/log/proftpd/tls.log + TLSEngine on + TLSLog /var/log/proftpd/tls.log # Support both SSLv3 and TLSv1, but they should not be used # (known to be weak) - TLSProtocol TLSv1.1 TLSv1.2 + TLSProtocol TLSv1.1 TLSv1.2 # Are clients required to use FTP over TLS when talking to this server? - TLSRequired off + TLSRequired off # Server's RSA certificate - TLSRSACertificateFile /etc/proftpd/ssl/proftpd.cert.pem - TLSRSACertificateKeyFile /etc/proftpd/ssl/proftpd.key.pem + TLSRSACertificateFile /etc/proftpd/ssl/proftpd.cert.pem + TLSRSACertificateKeyFile /etc/proftpd/ssl/proftpd.key.pem # CA (or CA chain) to verify client certs #TLSCACertificateFile /etc/proftpd/ssl/proftpd.cacert.pem @@ -28,15 +28,15 @@ TLSCertificateChainFile /etc/proftpd/ssl/proftpd.cacert.pem # Authenticate clients that want to use FTP over TLS? - TLSVerifyClient off + TLSVerifyClient off # Allow SSL/TLS renegotiations when the client requests them, but # do not force the renegotations. Some clients do not support # SSL/TLS renegotiations; when mod_tls forces a renegotiation, these # clients will close the data connection, or there will be a timeout # on an idle data connection. - TLSRenegotiate none + TLSRenegotiate none # Should Server request a Clients Certificate and send valid CA list ? - TLSOptions NoCertRequest NoSessionReuseRequired + TLSOptions NoSessionReuseRequired diff --git a/proftpd.changes b/proftpd.changes index 1320f8f..5a75702 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 1 17:25:05 UTC 2020 - chris@computersalat.de + +- cleanup tls.template + * remove deprecated NoCertRequest from TLSOptions + ------------------------------------------------------------------- Sat Dec 28 20:45:30 UTC 2019 - chris@computersalat.de diff --git a/proftpd.spec b/proftpd.spec index 8d1ecb0..c7507f9 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed