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

fix: write include statement in nginx config

Browse Source
This commit is contained in:
Mahdi Dibaiee
2017-02-22 13:16:25 +03:30
parent bff0c6230b
commit b8fe5c304e
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/System/Serverman/Actions/Nginx.hs
View File

@ -20,13 +20,16 @@ module System.Serverman.Actions.Nginx (nginx) where
do
-- Turn SSL off at first, because we have not yet received a certificate
let content = show (params { ssl = False, port = "80" })
parent = configDirectory serverService </> "configs"
mainConfig = configDirectory serverService </> "nginx.conf"
parent = configDirectory serverService </> "serverman-configs"
path = parent </> domain
targetDir = directory
createDirectoryIfMissing True targetDir
createDirectoryIfMissing True parent
writeIncludeStatementIfMissing mainConfig parent
when ssl $ do
let sslPath = configDirectory serverService </> "ssl.conf"
writeFileIfMissing sslPath nginxSSL
@ -71,4 +74,14 @@ module System.Serverman.Actions.Nginx (nginx) where
writeFile path (show params)
wait =<< restart
writeIncludeStatementIfMissing path target = do
content <- readFile path
let statement = "include " ++ target ++ "/*"
when (not (statement `isInfixOf` content)) $ do
let newContent = appendAfter content "http {" (" " ++ statement)
writeFile path newContent

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

@ -29,15 +29,15 @@ module System.Serverman.Actions.WebServer (ServerParams(..), ServerType(..)) whe
in
case serverType conf of
Static ->
nginxBlock "server" $ keyvalue (base ++ [("root", directory conf)])
block "server" $ keyvalue (base ++ [("root", directory conf)])
PortForwarding ->
let proxyBlock = nginxBlock "location /" $
let proxyBlock = block "location /" $
keyvalue ([ ("proxy_pass", "http://127.0.0.1:" ++ forward conf)
, ("proxy_set_header", "X-Forwarded-Host $host")
, ("proxy_set_header", "X-Forwarded-Server $host")
, ("proxy_set_header", "X-Forwarded-For $proxy_add_x_forwarded_for")
])
in nginxBlock "server" $ keyvalue base ++ proxyBlock
in block "server" $ keyvalue base ++ proxyBlock
| otherwise = "Unknown service provider"