From 36f3daf7ae3a76711cdc319a97a835047cd22605 Mon Sep 17 00:00:00 2001
From: Christoph Kluenter <ckluente@thouthworks.com>
Date: Thu, 7 Jul 2016 09:15:52 +0200
Subject: [pkg] remove pixelated from requirements-latest.pip

modifying original PR [0] by cristoph to account for the recent
vendoring of l2db code, which means we no longer depend on u1db/dirspec.

I expect the whole mess about the venv setup to be further simplified
pretty soon, since we are going to merge most of the leap.* packages
into a couple of repos.

[0] https://github.com/leapcode/soledad/pull/327
---
 server/pkg/requirements-latest.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/pkg')

diff --git a/server/pkg/requirements-latest.pip b/server/pkg/requirements-latest.pip
index 46a7ccba..d32e1ffa 100644
--- a/server/pkg/requirements-latest.pip
+++ b/server/pkg/requirements-latest.pip
@@ -1,5 +1,5 @@
 --index-url https://pypi.python.org/simple/
 
--e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common'
+-e 'git+https://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common'
 -e '../common'
 -e .
-- 
cgit v1.2.3


From c7b464077215425759ab402fb2314f4e8f9acd7e Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Sat, 23 Jul 2016 17:11:53 +0200
Subject: [test] remove traces of design docs from couch tests

---
 server/pkg/create-user-db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/pkg')

diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db
index 5e48d4de..b955b4c3 100755
--- a/server/pkg/create-user-db
+++ b/server/pkg/create-user-db
@@ -80,7 +80,7 @@ def ensure_database(dbname):
     url = url_for_db(dbname)
     db_security = CONF['database-security']
     db = CouchDatabase.open_database(url=url, create=True,
-                                     replica_uid=None, ensure_ddocs=True,
+                                     replica_uid=None,
                                      database_security=db_security)
     print ('success! Ensured that database %s exists, with replica_uid: %s' %
            (db._dbname, db.replica_uid))
-- 
cgit v1.2.3


From c8709722223f6c813ad49df09185c316746f9edb Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 8 Aug 2016 13:50:38 -0300
Subject: [pkg] remove version pinning for couchdb and beaker

We will not maintain support for older versions of debian as that
introduces some unneeded complexity for now. Also, the version pinned
for couchdb python library has a bug that makes some requests slow.
Because of those, we remove the pinning for now.
---
 server/pkg/requirements.pip | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'server/pkg')

diff --git a/server/pkg/requirements.pip b/server/pkg/requirements.pip
index 2d845f24..e92dfde6 100644
--- a/server/pkg/requirements.pip
+++ b/server/pkg/requirements.pip
@@ -1,6 +1,5 @@
 configparser
 PyOpenSSL
 twisted>=12.3.0
-#pinned for wheezy compatibility
-Beaker==1.6.3 #wheezy
-couchdb==0.8 #wheezy
+Beaker
+couchdb
-- 
cgit v1.2.3


From 7d2e485d37c2928b7ed773df7f6a5aa98e3396c0 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 9 Aug 2016 15:25:50 -0300
Subject: [feat] log to syslog (#8286)

---
 server/pkg/soledad-server | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'server/pkg')

diff --git a/server/pkg/soledad-server b/server/pkg/soledad-server
index 74ed122e..9dada6a0 100644
--- a/server/pkg/soledad-server
+++ b/server/pkg/soledad-server
@@ -12,7 +12,6 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 PIDFILE=/var/run/soledad.pid
 OBJ=leap.soledad.server.application
-LOGFILE=/var/log/soledad.log
 HTTPS_PORT=2424
 CONFDIR=/etc/soledad
 CERT_PATH="${CONFDIR}/soledad-server.pem"
@@ -37,7 +36,8 @@ case "${1}" in
             --exec ${TWISTD_PATH} -- \
             --uid=${USER} --gid=${GROUP} \
             --pidfile=${PIDFILE} \
-            --logfile=${LOGFILE} \
+	    --syslog \
+	    --prefix=soledad-server \
             web \
             --wsgi=${OBJ} \
             --port=ssl:${HTTPS_PORT}:privateKey=${PRIVKEY_PATH}:certKey=${CERT_PATH}:sslmethod=${SSL_METHOD}
-- 
cgit v1.2.3


From 0fd7e9f018b02161a844c11332ffced56b256010 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Wed, 9 Nov 2016 11:20:12 -0200
Subject: [pkg] update leap requirements files

---
 server/pkg/requirements-leap.pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/pkg')

diff --git a/server/pkg/requirements-leap.pip b/server/pkg/requirements-leap.pip
index aaad340c..93b447e5 100644
--- a/server/pkg/requirements-leap.pip
+++ b/server/pkg/requirements-leap.pip
@@ -1 +1 @@
-leap.soledad.common>=0.6.5
+leap.soledad.common>=0.9.0
-- 
cgit v1.2.3