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

fix: semicolon redirect block

Browse Source
This commit is contained in:
Mahdi Dibaiee 2017-04-25 11:36:21 +04:30
parent 1a2c6f5fe4
commit 1ab8b73170
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/nginx/src/Types.hs
View File

@ -44,6 +44,7 @@ module Types ( ServerType (..)
show ServerParams { directory, domain, port, forward, email, ssl, serverType, directoryListing } = show ServerParams { directory, domain, port, forward, email, ssl, serverType, directoryListing } =
let redirect let redirect
| ssl = block "server" $ | ssl = block "server" $
semicolon $
keyvalue [ ("listen", "80") keyvalue [ ("listen", "80")
, ("listen", "[::]:80") , ("listen", "[::]:80")
, ("server_name", domain) , ("server_name", domain)
@ -67,7 +68,10 @@ module Types ( ServerType (..)
in in
case serverType of case serverType of
Static -> Static ->
block "server" $ semicolon $ keyvalue (base ++ [("root", directory)]) " " ++ "\n" ++ redirect block "server"
(semicolon $
keyvalue (base ++ [("root", directory)]) " ")
++ "\n" ++ redirect
PortForwarding -> PortForwarding ->
let proxyBlock = block "location /" $ let proxyBlock = block "location /" $
@ -77,4 +81,6 @@ module Types ( ServerType (..)
, ("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" $ semicolon (keyvalue base " ") ++ proxyBlock ++ "\n" ++ semicolon redirect in block "server"
(semicolon (keyvalue base " "))
++ proxyBlock ++ "\n" ++ redirect