Commit: 6be593d82db1cfc7521f2a37f1c13b977286627b - firefox-sync-server-1.1 (hg)

Commit MetaInfo

• Revision: 6be593d82db1cfc7521f2a37f1c13b977286627b (tree)
• Zeit: 2015-10-12 12:12:56
• Autor: Ryan Kelly <rfkelly@mozi...>
• Commiter: Ryan Kelly

Log Message

Run a keyexchange server as part of the all-in-one bundle.

Ändern Zusammenfassung

• modified: Makefile
• modified: development.ini
• modified: etc/sync.conf

Diff

diff -r 647d34ba55ff -r 6be593d82db1 Makefile
--- a/Makefile	Fri Oct 09 08:49:32 2015 +1100
+++ b/Makefile	Mon Oct 12 14:12:56 2015 +1100
@@ -1,12 +1,11 @@
-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

diff -r 647d34ba55ff -r 6be593d82db1 development.ini
--- a/development.ini	Fri Oct 09 08:49:32 2015 +1100
+++ b/development.ini	Mon Oct 12 14:12:56 2015 +1100
@@ -10,10 +10,19 @@
 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
 #

diff -r 647d34ba55ff -r 6be593d82db1 etc/sync.conf
--- a/etc/sync.conf	Fri Oct 09 08:49:32 2015 +1100
+++ b/etc/sync.conf	Mon Oct 12 14:12:56 2015 +1100
@@ -49,3 +49,7 @@
 backend = services.resetcodes.rc_sql.ResetCodeSQL
 sqluri = sqlite:////tmp/test.db
 create_tables = True
+
+[keyexchange]
+use_memory = true
+