diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/changes/bug_6557_fix-server-initscript-location | 1 | ||||
| -rw-r--r-- | server/changes/bug_fix-initscript-uid-and-gid | 1 | ||||
| -rw-r--r-- | server/pkg/requirements.pip | 8 | ||||
| -rw-r--r-- | server/pkg/soledad-server | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/server/changes/bug_6557_fix-server-initscript-location b/server/changes/bug_6557_fix-server-initscript-location new file mode 100644 index 00000000..6032b302 --- /dev/null +++ b/server/changes/bug_6557_fix-server-initscript-location @@ -0,0 +1 @@ + o Fix server initscript location (#6557). 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/requirements.pip b/server/pkg/requirements.pip index f9cce08e..c99b2715 100644 --- a/server/pkg/requirements.pip +++ b/server/pkg/requirements.pip @@ -3,11 +3,7 @@ u1db routes PyOpenSSL twisted>=12.3.0 -#pinned for wheezy compatibility -Beaker==1.6.3 #wheezy -couchdb==0.8 #wheezy +Beaker +couchdb -# XXX -- fix me! -# oauth is not strictly needed by us, but we need it until u1db adds it to its -# release as a dep. oauth diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server index 74ed122e..da00e06b 100644 --- a/server/pkg/soledad-server +++ b/server/pkg/soledad-server @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: soledad +# Provides: soledad-server # Required-Start: $network $named $remote_fs $syslog $time # Required-Stop: $network $named $remote_fs $syslog # Default-Start: 2 3 4 5 |