Run a keyexchange server as part of the all-in-one bundle. default tip
authorRyan Kelly <rfkelly@mozilla.com>
Mon, 12 Oct 2015 14:12:56 +1100
changeset 553 6be593d82db1
parent 552 647d34ba55ff
push id133
push userrkelly@mozilla.com
push date2015-10-12 03:13 +0000
Run a keyexchange server as part of the all-in-one bundle.
Makefile
development.ini
etc/sync.conf
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,16 @@
-DEPS = server-core,server-reg,server-storage
+DEPS = server-core,server-reg,server-storage,server-key-exchange
 PYTHON = `which python2 python | head -n 1`
 VIRTUALENV = virtualenv --python=$(PYTHON)
 NOSE = bin/nosetests -s --with-xunit
-TESTS = deps/server-core/services/tests deps/server-reg/syncreg/tests deps/server-storage/syncstorage/tests
-SERVER = dev-auth.services.mozilla.com
-SCHEME = https
+TESTS = deps/server-core/services/tests deps/server-reg/syncreg/tests deps/server-storage/syncstorage/tests deps/server-key-exchange/keyexchange/tests
 BUILDAPP = bin/buildapp
 BUILDRPMS = bin/buildrpms
+SCHEME = https
 PYPI = $(SCHEME)://pypi.python.org/simple
 PYPIOPTIONS = -i $(PYPI)
 CHANNEL = dev
 INSTALL = bin/pip install
 INSTALLOPTIONS = -U -i $(PYPI)
 
 ifdef PYPIEXTRAS
 	PYPIOPTIONS += -e $(PYPIEXTRAS)
--- a/development.ini
+++ b/development.ini
@@ -5,20 +5,29 @@ profile = False
 
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
 port = 5000
 use_threadpool = True
 threadpool_workers = 60
 
-[app:main]
+[composite:main]
+use = egg:Paste#urlmap
+/ = mainapp
+/jpake = keyexchange
+
+[app:mainapp]
 use = egg:SyncServer
 configuration = file:%(here)s/etc/sync.conf
 
+[app:keyexchange]
+use = egg:KeyExchange
+configuration = file:%(here)s/etc/sync.conf
+
 #
 # logging
 #
 [loggers]
 keys = root,syncserver
 
 [handlers]
 keys = global,syncserver,syncserver_errors
--- a/etc/sync.conf
+++ b/etc/sync.conf
@@ -44,8 +44,12 @@ vendor = mozilla
 version = 0
 device_version = 1.3
 product = weave
 
 [reset_codes]
 backend = services.resetcodes.rc_sql.ResetCodeSQL
 sqluri = sqlite:////tmp/test.db
 create_tables = True
+
+[keyexchange]
+use_memory = true
+