From 1ab8b73170430181c770b5557798a21757c8aab5 Mon Sep 17 00:00:00 2001
From: Mahdi Dibaiee <mdibaiee@aol.com>
Date: Tue, 25 Apr 2017 11:36:21 +0430
Subject: [PATCH] fix: semicolon redirect block

---
 services/nginx/src/Types.hs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/services/nginx/src/Types.hs b/services/nginx/src/Types.hs
index 20ddfa2..b918cbf 100644
--- a/services/nginx/src/Types.hs
+++ b/services/nginx/src/Types.hs
@@ -44,6 +44,7 @@ module Types ( ServerType (..)
     show ServerParams { directory, domain, port, forward, email, ssl, serverType, directoryListing } =
       let redirect
             | ssl = block "server" $
+                      semicolon $
                           keyvalue [ ("listen", "80")
                                    , ("listen", "[::]:80")
                                    , ("server_name", domain)
@@ -67,7 +68,10 @@ module Types ( ServerType (..)
       in 
         case serverType of
           Static -> 
-            block "server" $ semicolon $ keyvalue (base ++ [("root", directory)]) " " ++ "\n" ++ redirect
+            block "server" 
+              (semicolon $
+                keyvalue (base ++ [("root", directory)]) " ")
+            ++ "\n" ++ redirect
 
           PortForwarding -> 
             let proxyBlock = block "location /" $
@@ -77,4 +81,6 @@ module Types ( ServerType (..)
                                            , ("proxy_set_header", "X-Forwarded-Server $host")
                                            , ("proxy_set_header", "X-Forwarded-For $proxy_add_x_forwarded_for")
                                            ] " "
-            in block "server" $ semicolon (keyvalue base " ") ++ proxyBlock ++ "\n" ++ semicolon redirect
+            in block "server"
+                 (semicolon (keyvalue base " "))
+              ++ proxyBlock ++ "\n" ++ redirect