thereadme/serverman
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(webserver): newline between blocks

Browse Source
This commit is contained in:
Mahdi Dibaiee 2017-02-22 13:59:38 +03:30
parent 98eb84d867
commit 4f38e2bd83
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/System/Serverman/Actions/WebServer.hs
View File

@ -41,8 +41,7 @@ module System.Serverman.Actions.WebServer (ServerParams(..), ServerType(..)) whe
in in
case serverType conf of case serverType conf of
Static -> Static ->
(block "server" $ keyvalue (base ++ [("root", directory conf)])) ++ (block "server" $ keyvalue (base ++ [("root", directory conf)])) ++ "\n" ++ redirect
redirect
PortForwarding -> PortForwarding ->
let proxyBlock = block "location /" $ let proxyBlock = block "location /" $
@ -51,6 +50,6 @@ module System.Serverman.Actions.WebServer (ServerParams(..), ServerType(..)) whe
, ("proxy_set_header", "X-Forwarded-Server $host") , ("proxy_set_header", "X-Forwarded-Server $host")
, ("proxy_set_header", "X-Forwarded-For $proxy_add_x_forwarded_for") , ("proxy_set_header", "X-Forwarded-For $proxy_add_x_forwarded_for")
]) ])
in (block "server" $ keyvalue base ++ proxyBlock) ++ redirect in (block "server" $ keyvalue base ++ proxyBlock) ++ "\n" ++ redirect
| otherwise = "Unknown service provider" | otherwise = "Unknown service provider"