diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 15:52:06 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 15:52:06 -0300 |
| commit | 86578e5e48fb394297da33f5f93ca07aed9e1af3 (patch) | |
| tree | 70ffb63227d8b93224339267589a08297f3d58fb /server | |
| parent | 21f58ccc9a29ee82faf0924ea03f39b3c91e43ee (diff) | |
| parent | 6a72835b3fa7267ffcf30ae0e5b5fa948e296390 (diff) | |
Merge branch 'release-0.3.2'
Diffstat (limited to 'server')
| -rw-r--r-- | server/pkg/soledad | 2 | ||||
| -rw-r--r-- | server/setup.py | 10 | ||||
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/server/pkg/soledad b/server/pkg/soledad index c233731e..841233d1 100644 --- a/server/pkg/soledad +++ b/server/pkg/soledad @@ -12,7 +12,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin PIDFILE=/var/run/soledad.pid RUNDIR=/var/lib/soledad/ -OBJ=leap.soledad_server.application +OBJ=leap.soledad.server.application LOGFILE=/var/log/soledad.log HTTPS_PORT=2424 CERT_PATH=/etc/leap/soledad-server.pem diff --git a/server/setup.py b/server/setup.py index 7dcd127c..348aa838 100644 --- a/server/setup.py +++ b/server/setup.py @@ -29,7 +29,8 @@ versioneer.parentdir_prefix = 'leap.soledad.server-' from pkg import utils -if os.environ.get('VIRTUAL_ENV', None): +isset = lambda var: os.environ.get(var, None) +if isset('VIRTUAL_ENV') or isset('LEAP_SKIP_INIT'): data_files = None else: # XXX this should go only for linux/mac @@ -57,18 +58,19 @@ setup( cmdclass=versioneer.get_cmdclass(), url='https://leap.se/', license='GPLv3+', - description='Synchronization of locally encrypted data among devices.', + description='Synchronization of locally encrypted data among devices ' + '(server components)', author='The LEAP Encryption Access Project', author_email='info@leap.se', long_description=( "Soledad is the part of LEAP that allows application data to be " "securely shared among devices. It provides, to other parts of the " - "LEAP client, an API for data storage and sync." + "LEAP project, an API for data storage and sync." ), classifiers=trove_classifiers, namespace_packages=["leap", "leap.soledad"], packages=find_packages('src'), package_dir={'': 'src'}, install_requires=utils.parse_requirements(), - data_files=data_files, + data_files=data_files ) diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 0c56acb9..67b0611d 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -20,7 +20,7 @@ A U1DB server that stores data using CouchDB as its persistence layer. This should be run with: - twistd -n web --wsgi=leap.soledad_server.application --port=2424 + twistd -n web --wsgi=leap.soledad.server.application --port=2424 """ import configparser |