snoyberg/keter
1
1
Fork 0
mirror of https://github.com/snoyberg/keter.git synced 2025-01-08 07:40:25 +03:00
Code Issues Projects Releases Wiki Activity

Fix five minutes (thanks @tolysz)

Browse Source
This commit is contained in:
Michael Snoyman 2015-05-03 19:57:14 +03:00
parent 28cb3ff587
commit 491ace549e
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Keter/Types/V04.hs
View File

@ -93,9 +93,12 @@ instance Default KeterConfig where
, kconfigSetuid = Nothing , kconfigSetuid = Nothing
, kconfigReverseProxy = Set.empty , kconfigReverseProxy = Set.empty
, kconfigIpFromHeader = False , kconfigIpFromHeader = False
, kconfigConnectionTimeBound = 5000 , kconfigConnectionTimeBound = fiveMinutes
} }
fiveMinutes :: Int
fiveMinutes = 5 * 60 * 1000
instance ParseYamlFile KeterConfig where instance ParseYamlFile KeterConfig where
parseYamlFile basedir = withObject "KeterConfig" $ \o -> KeterConfig parseYamlFile basedir = withObject "KeterConfig" $ \o -> KeterConfig
<$> lookupBase basedir o "root" <$> lookupBase basedir o "root"
@ -106,7 +109,7 @@ instance ParseYamlFile KeterConfig where
<*> o .:? "setuid" <*> o .:? "setuid"
<*> o .:? "reverse-proxy" .!= Set.empty <*> o .:? "reverse-proxy" .!= Set.empty
<*> o .:? "ip-from-header" .!= False <*> o .:? "ip-from-header" .!= False
<*> o .:? "connection-time-bound" .!= 5000 <*> o .:? "connection-time-bound" .!= fiveMinutes
data TLSConfig = TLSConfig !Warp.Settings !WarpTLS.TLSSettings data TLSConfig = TLSConfig !Warp.Settings !WarpTLS.TLSSettings

4
Keter/Types/V10.hs
View File

@ -139,7 +139,7 @@ instance Default KeterConfig where
, kconfigExternalHttpPort = 80 , kconfigExternalHttpPort = 80
, kconfigExternalHttpsPort = 443 , kconfigExternalHttpsPort = 443
, kconfigEnvironment = Map.empty , kconfigEnvironment = Map.empty
, kconfigConnectionTimeBound = 5000 , kconfigConnectionTimeBound = V04.fiveMinutes
} }
instance ParseYamlFile KeterConfig where instance ParseYamlFile KeterConfig where
@ -159,7 +159,7 @@ instance ParseYamlFile KeterConfig where
<*> o .:? "external-http-port" .!= 80 <*> o .:? "external-http-port" .!= 80
<*> o .:? "external-https-port" .!= 443 <*> o .:? "external-https-port" .!= 443
<*> o .:? "env" .!= Map.empty <*> o .:? "env" .!= Map.empty
<*> o .:? "connection-time-bound" .!= 5000 <*> o .:? "connection-time-bound" .!= V04.fiveMinutes
-- | Whether we should force redirect to HTTPS routes. -- | Whether we should force redirect to HTTPS routes.
type RequiresSecure = Bool type RequiresSecure = Bool

4
etc/keter-config.yaml
View File

@ -34,5 +34,5 @@ listeners:
# key: value # key: value
# Connection time bound in milliseconds, set to 0 to have no time bound, # Connection time bound in milliseconds, set to 0 to have no time bound,
# i.e. keep connections alive indefinitely. Default value is 5000. # i.e. keep connections alive indefinitely. Default value is 5 minutes.
# connection-time-bound: 5000 # connection-time-bound: 300000

2
keter.cabal
View File

@ -1,5 +1,5 @@
Name: keter Name: keter
Version: 1.3.10 Version: 1.3.10.1
Synopsis: Web application deployment manager, focusing on Haskell web frameworks Synopsis: Web application deployment manager, focusing on Haskell web frameworks
Description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/keter>. Description: Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/keter>.
Homepage: http://www.yesodweb.com/ Homepage: http://www.yesodweb.com/