Merge branch 'master' into master-ghc8107
This commit is contained in:
commit
ff239d81e5
@ -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",
|
||||||
|
Loading…
Reference in New Issue
Block a user