Merge branch 'master' into master-ghc8107

This commit is contained in:
Evgeny Poberezkin 2023-12-27 21:02:11 +00:00
commit ff239d81e5

View File

@ -405,6 +405,7 @@ xftpServerConfig =
allowNewFiles = True, allowNewFiles = True,
newFileBasicAuth = Nothing, newFileBasicAuth = Nothing,
fileExpiration = Just defaultFileExpiration, fileExpiration = Just defaultFileExpiration,
inactiveClientExpiration = Just defaultInactiveClientExpiration,
caCertificateFile = "tests/fixtures/tls/ca.crt", caCertificateFile = "tests/fixtures/tls/ca.crt",
privateKeyFile = "tests/fixtures/tls/server.key", privateKeyFile = "tests/fixtures/tls/server.key",
certificateFile = "tests/fixtures/tls/server.crt", certificateFile = "tests/fixtures/tls/server.crt",