unit: 1.8.0 -> 1.9.0
This commit is contained in:
parent
2c074fc6c8
commit
aa8a11c1b3
|
@ -16,14 +16,14 @@
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.8.0";
|
version = "1.9.0";
|
||||||
name = "unit-${version}";
|
name = "unit-${version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nginx";
|
owner = "nginx";
|
||||||
repo = "unit";
|
repo = "unit";
|
||||||
rev = "${version}";
|
rev = "${version}";
|
||||||
sha256 = "1s5pfyhabnf9p5z2h1fh0wb4hqzkrha5bxahjnikmlkhw59s8zip";
|
sha256 = "0f7smgshfzksks2jfhi53g87wiyy38vwgj6aa70ql61m135dx7b1";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ which ];
|
nativeBuildInputs = [ which ];
|
||||||
|
@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
|
||||||
++ optional withRuby ruby
|
++ optional withRuby ruby
|
||||||
++ optional withSSL openssl;
|
++ optional withSSL openssl;
|
||||||
|
|
||||||
# Used patch to enable work with unprivileged user - https://github.com/nginx/unit/issues/228
|
|
||||||
patches = [ ./unit-rootless.patch ];
|
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--control=unix:/run/unit/control.unit.sock"
|
"--control=unix:/run/unit/control.unit.sock"
|
||||||
"--pid=/run/unit/unit.pid"
|
"--pid=/run/unit/unit.pid"
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
diff --git a/src/nxt_process.c b/src/nxt_process.c
|
|
||||||
index 5952029..7b29369 100644
|
|
||||||
--- a/src/nxt_process.c
|
|
||||||
+++ b/src/nxt_process.c
|
|
||||||
@@ -136,7 +136,7 @@ nxt_process_start(nxt_task_t *task, nxt_process_t *process)
|
|
||||||
|
|
||||||
nxt_random_init(&thread->random);
|
|
||||||
|
|
||||||
- if (init->user_cred != NULL && getuid() == 0) {
|
|
||||||
+ if (init->user_cred != NULL) {
|
|
||||||
/* Super-user. */
|
|
||||||
|
|
||||||
ret = nxt_user_cred_set(task, init->user_cred);
|
|
||||||
@@ -434,9 +434,7 @@ nxt_user_cred_get(nxt_task_t *task, nxt_user_cred_t *uc, const char *group)
|
|
||||||
uc->base_gid = grp->gr_gid;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (getuid() == 0) {
|
|
||||||
return nxt_user_groups_get(task, uc);
|
|
||||||
- }
|
|
||||||
|
|
||||||
return NXT_OK;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue