From 0b13f1eeef095e14beea065f9e6b97159180d37a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 26 Aug 2013 15:25:04 +0200 Subject: Add some notes about the package split. * in description line * in readme * add each package crate icon and link. --- server/setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'server') diff --git a/server/setup.py b/server/setup.py index 7dcd127c..e5c36278 100644 --- a/server/setup.py +++ b/server/setup.py @@ -57,13 +57,14 @@ 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"], -- cgit v1.2.3 From 18241699c963921ebf3e990ad19c0fd60c673f05 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 27 Aug 2013 18:38:56 +0200 Subject: add bypass var for init files --- server/setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'server') diff --git a/server/setup.py b/server/setup.py index e5c36278..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 @@ -71,5 +72,5 @@ setup( packages=find_packages('src'), package_dir={'': 'src'}, install_requires=utils.parse_requirements(), - data_files=data_files, + data_files=data_files ) -- cgit v1.2.3 From fa3f18d1455d9d1cdb63d52af05ad014c0aee47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Thu, 29 Aug 2013 14:44:10 -0300 Subject: Use soledad.server namespace in init script --- server/changes/bug_init_script | 2 ++ server/pkg/soledad | 2 +- server/src/leap/soledad/server/__init__.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 server/changes/bug_init_script (limited to 'server') diff --git a/server/changes/bug_init_script b/server/changes/bug_init_script new file mode 100644 index 00000000..dc4fc322 --- /dev/null +++ b/server/changes/bug_init_script @@ -0,0 +1,2 @@ + o Fix the init script for soledad server so that it uses the new + package namespace. \ No newline at end of file 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/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 -- cgit v1.2.3 From 6a72835b3fa7267ffcf30ae0e5b5fa948e296390 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 6 Sep 2013 15:42:00 -0300 Subject: Fold in changes. --- server/changes/bug_init_script | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 server/changes/bug_init_script (limited to 'server') diff --git a/server/changes/bug_init_script b/server/changes/bug_init_script deleted file mode 100644 index dc4fc322..00000000 --- a/server/changes/bug_init_script +++ /dev/null @@ -1,2 +0,0 @@ - o Fix the init script for soledad server so that it uses the new - package namespace. \ No newline at end of file -- cgit v1.2.3