diff options
Diffstat (limited to 'server/pkg')
| -rw-r--r-- | server/pkg/requirements.pip | 1 | ||||
| -rw-r--r-- | server/pkg/soledad-server | 4 | 
2 files changed, 3 insertions, 2 deletions
| diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip index e92dfde6..e4a87e74 100644 --- a/server/pkg/requirements.pip +++ b/server/pkg/requirements.pip @@ -3,3 +3,4 @@ PyOpenSSL  twisted>=12.3.0  Beaker  couchdb +python-cjson diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server index d9dab040..753a260b 100644 --- a/server/pkg/soledad-server +++ b/server/pkg/soledad-server @@ -11,7 +11,7 @@  PATH=/sbin:/bin:/usr/sbin:/usr/bin  PIDFILE=/var/run/soledad.pid -OBJ=leap.soledad.server.application.wsgi_application +RESOURCE_CLASS=leap.soledad.server.resource.SoledadResource  HTTPS_PORT=2424  CONFDIR=/etc/soledad  CERT_PATH="${CONFDIR}/soledad-server.pem" @@ -39,7 +39,7 @@ case "${1}" in  	    --syslog \  	    --prefix=soledad-server \              web \ -            --wsgi=${OBJ} \ +            --class=${RESOURCE_CLASS} \              --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}          echo "."      ;; | 
