summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-03-09 15:22:17 -0300
committerdrebs <drebs@leap.se>2015-03-09 15:36:32 -0300
commit541cbfe1da35a88f07134b7d53aaa234145a7d18 (patch)
tree66107e633d49cc75fbc87054b6fe24c13fdbac62 /server
parent23cbe0959ecee11d90cdea2545607fedc66a666c (diff)
[cherry-pick] Fix soledad initscript uid and gid.
Diffstat (limited to 'server')
-rw-r--r--server/changes/bug_fix-initscript-uid-and-gid1
-rw-r--r--server/pkg/soledad-server2
2 files changed, 2 insertions, 1 deletions
diff --git a/server/changes/bug_fix-initscript-uid-and-gid b/server/changes/bug_fix-initscript-uid-and-gid
new file mode 100644
index 00000000..d4767984
--- /dev/null
+++ b/server/changes/bug_fix-initscript-uid-and-gid
@@ -0,0 +1 @@
+ o Fix server daemon uid and gid by passing them to twistd on the initscript.
diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server
index ccb3e9b0..811ad55b 100644
--- a/server/pkg/soledad-server
+++ b/server/pkg/soledad-server
@@ -34,8 +34,8 @@ case "${1}" in
start)
echo -n "Starting soledad: twistd"
start-stop-daemon --start --quiet \
- --user=${USER} --group=${GROUP} \
--exec ${TWISTD_PATH} -- \
+ --uid=${USER} --gid=${GROUP} \
--pidfile=${PIDFILE} \
--logfile=${LOGFILE} \
web \