diff options
Diffstat (limited to 'soledad_server')
| -rw-r--r-- | soledad_server/pkg/soledad | 14 | ||||
| -rw-r--r-- | soledad_server/setup.py | 5 | ||||
| -rw-r--r-- | soledad_server/src/leap/soledad_server/__init__.py | 2 | ||||
| -rw-r--r-- | soledad_server/src/leap/soledad_server/auth.py | 4 |
4 files changed, 10 insertions, 15 deletions
diff --git a/soledad_server/pkg/soledad b/soledad_server/pkg/soledad index 1254cabe..c233731e 100644 --- a/soledad_server/pkg/soledad +++ b/soledad_server/pkg/soledad @@ -15,7 +15,6 @@ RUNDIR=/var/lib/soledad/ OBJ=leap.soledad_server.application LOGFILE=/var/log/soledad.log HTTPS_PORT=2424 -PLAIN_PORT=65534 CERT_PATH=/etc/leap/soledad-server.pem PRIVKEY_PATH=/etc/leap/soledad-server.key TWISTD_PATH=/usr/bin/twistd @@ -32,14 +31,11 @@ case "$1" in start) echo -n "Starting soledad: twistd" start-stop-daemon --start --quiet --exec $TWISTD_PATH -- \ - --pidfile=$PIDFILE \ - --logfile=$LOGFILE \ - web \ - --wsgi=$OBJ \ - --https=$HTTPS_PORT \ - --certificate=$CERT_PATH \ - --privkey=$PRIVKEY_PATH \ - --port=$PLAIN_PORT + --pidfile=$PIDFILE \ + --logfile=$LOGFILE \ + web \ + --wsgi=$OBJ \ + --port=ssl:$HTTPS_PORT:privateKey=$PRIVKEY_PATH:certKey=$CERT_PATH echo "." ;; diff --git a/soledad_server/setup.py b/soledad_server/setup.py index f022c9cf..16cebca1 100644 --- a/soledad_server/setup.py +++ b/soledad_server/setup.py @@ -34,7 +34,7 @@ install_requirements = [ 'six==1.1.0', 'routes', 'PyOpenSSL', - 'leap.soledad>=0.2.3', + 'leap.soledad>=0.3.0', ] @@ -60,7 +60,7 @@ trove_classifiers = ( setup( name='leap.soledad_server', - version='0.2.3', + version='0.3.0', url='https://leap.se/', license='GPLv3+', description='Synchronization of locally encrypted data among devices.', @@ -75,6 +75,5 @@ setup( packages=find_packages('src'), package_dir={'': 'src'}, install_requires=install_requirements, - data_files=data_files, classifiers=trove_classifiers, ) diff --git a/soledad_server/src/leap/soledad_server/__init__.py b/soledad_server/src/leap/soledad_server/__init__.py index 79609d7d..18a0546e 100644 --- a/soledad_server/src/leap/soledad_server/__init__.py +++ b/soledad_server/src/leap/soledad_server/__init__.py @@ -122,4 +122,4 @@ state = CouchServerState(conf['couch_url']) # WSGI application that may be used by `twistd -web` application = SoledadTokenAuthMiddleware(SoledadApp(state)) -resource = WSGIResource(reactor, reactor.getThreadPool(), application) +resource = WSGIResource(reactor, reactor.getThreadPool(), application)
\ No newline at end of file diff --git a/soledad_server/src/leap/soledad_server/auth.py b/soledad_server/src/leap/soledad_server/auth.py index e0169523..3bcfcf04 100644 --- a/soledad_server/src/leap/soledad_server/auth.py +++ b/soledad_server/src/leap/soledad_server/auth.py @@ -343,8 +343,8 @@ class SoledadAuthMiddleware(object): @rtype: bool """ return URLToAuthorization( - uuid, self.app.SHARED_DB_NAME, - self.app.USER_DB_PREFIX + uuid, self._app.SHARED_DB_NAME, + self._app.USER_DB_PREFIX ).is_authorized(environ) @abstractmethod |