Commit 7032198a authored by Unknown's avatar Unknown

Merge branch 'support-root-env'

parents 2d643c5c 0a4a6703
......@@ -21,7 +21,7 @@ class NginxConfig
json = JSON.parse(File.read(json_file)) if File.exist?(json_file)
json["worker_connections"] ||= ENV["WORKER_CONNECTIONS"] || DEFAULT[:worker_connections]
json["port"] ||= ENV["PORT"] || 5000
json["root"] ||= DEFAULT[:root]
json["root"] ||= ENV["ROOT"] || DEFAULT[:root]
json["encoding"] ||= DEFAULT[:encoding]
index = 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment