From 4f38e2bd83efb8582051532939d12db6c0acf7a6 Mon Sep 17 00:00:00 2001 From: Mahdi Dibaiee Date: Wed, 22 Feb 2017 13:59:38 +0330 Subject: [PATCH] fix(webserver): newline between blocks --- src/System/Serverman/Actions/WebServer.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/System/Serverman/Actions/WebServer.hs b/src/System/Serverman/Actions/WebServer.hs index e75c15e..4a2d446 100644 --- a/src/System/Serverman/Actions/WebServer.hs +++ b/src/System/Serverman/Actions/WebServer.hs @@ -41,8 +41,7 @@ module System.Serverman.Actions.WebServer (ServerParams(..), ServerType(..)) whe in case serverType conf of Static -> - (block "server" $ keyvalue (base ++ [("root", directory conf)])) ++ - redirect + (block "server" $ keyvalue (base ++ [("root", directory conf)])) ++ "\n" ++ redirect PortForwarding -> 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-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"