Merge pull request #2311 from depay/set_nobody_nobody_as_default

fix(conf) set `nobody nobody` as default nginx user
Kong · Mar 31, 2017 · b12c971 · b12c971
2 parents df49932 + 043f14f
commit b12c971
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/kong.conf.default b/kong.conf.default
@@ -68,7 +68,7 @@
                                  # HTTPS requests to the admin API, if
                                  # `admin_ssl` is enabled.
 
-#nginx_user = nobody             # Defines user and group credentials used by
+#nginx_user = nobody nobody      # Defines user and group credentials used by
                                  # worker processes. If group is omitted, a
                                  # group whose name equals that of user is
                                  # used. Ex: [user] [group].

diff --git a/kong/templates/kong_defaults.lua b/kong/templates/kong_defaults.lua
@@ -8,7 +8,7 @@ proxy_listen = 0.0.0.0:8000
 proxy_listen_ssl = 0.0.0.0:8443
 admin_listen = 0.0.0.0:8001
 admin_listen_ssl = 0.0.0.0:8444
-nginx_user = nobody
+nginx_user = nobody nobody
 nginx_worker_processes = auto
 nginx_optimizations = on
 nginx_daemon = on

diff --git a/spec/01-unit/02-conf_loader_spec.lua b/spec/01-unit/02-conf_loader_spec.lua
@@ -5,7 +5,7 @@ describe("Configuration loader", function()
   it("loads the defaults", function()
     local conf = assert(conf_loader())
     assert.is_string(conf.lua_package_path)
-    assert.equal("nobody", conf.nginx_user)
+    assert.equal("nobody nobody", conf.nginx_user)
     assert.equal("auto", conf.nginx_worker_processes)
     assert.equal("0.0.0.0:8001", conf.admin_listen)
     assert.equal("0.0.0.0:8000", conf.proxy_listen)
@@ -22,7 +22,7 @@ describe("Configuration loader", function()
     -- defaults
     assert.equal("on", conf.nginx_daemon)
     -- overrides
-    assert.equal("nobody", conf.nginx_user)
+    assert.equal("nobody nobody", conf.nginx_user)
     assert.equal("1", conf.nginx_worker_processes)
     assert.equal("0.0.0.0:9001", conf.admin_listen)
     assert.equal("0.0.0.0:9000", conf.proxy_listen)
@@ -41,7 +41,7 @@ describe("Configuration loader", function()
     -- defaults
     assert.equal("on", conf.nginx_daemon)
     -- overrides
-    assert.equal("nobody", conf.nginx_user)
+    assert.equal("nobody nobody", conf.nginx_user)
     assert.equal("auto", conf.nginx_worker_processes)
     assert.equal("127.0.0.1:9001", conf.admin_listen)
     assert.equal("0.0.0.0:9000", conf.proxy_listen)

diff --git a/spec/01-unit/03-prefix_handler_spec.lua b/spec/01-unit/03-prefix_handler_spec.lua
@@ -126,7 +126,7 @@ describe("NGINX conf compiler", function()
   describe("compile_nginx_conf()", function()
     it("compiles a main NGINX conf", function()
       local nginx_conf = prefix_handler.compile_nginx_conf(helpers.test_conf)
-      assert.matches("user nobody;", nginx_conf, nil, true)
+      assert.matches("user nobody nobody;", nginx_conf, nil, true)
       assert.matches("worker_processes 1;", nginx_conf, nil, true)
       assert.matches("daemon on;", nginx_conf, nil, true)
     end)