Revert "Fix #246 Switch to syncstorage-rs, and document the additional depend… (#248)"

This reverts commit d925321183.

.gitignore

@@ -7,6 +7,3 @@ local
 *~
 nosetests.xml
 syncserver.db
-*.DS_Store
-syncstorage-rs
-.vscode

README.rst

@@ -1,14 +1,6 @@
 Run-Your-Own Firefox Sync Server
 ================================
 
-Note
-----
-
-For the duration of Q4 2020 this documentation will be revised. This situation will only be temporary until tokenserver is ported to rust and this documentation is rewritten to leave out the old dependencies.
-
-About syncserver
-----------------
-
 .. image:: https://circleci.com/gh/mozilla-services/syncserver/tree/master.svg?style=svg
    :target: https://circleci.com/gh/mozilla-services/syncserver/tree/master
 
@@ -16,7 +8,7 @@ About syncserver
    :target: https://hub.docker.com/r/mozilla/syncserver/
 
 This is an all-in-one package for running a self-hosted Firefox Sync server.
-It bundles the "tokenserver" project for authentication and the "syncstorage-rs"
+It bundles the "tokenserver" project for authentication and the "syncstorage"
 project for storage, to produce a single stand-alone webapp.
 
 Complete installation instructions are available at:
@@ -43,18 +35,6 @@ following packages (or similar, depending on your operating system) installed:
 - ncurses-dev
 - openssl-dev
 
-syncstorage-rs uses the following additional dependencies:
-
-- cmake
-- golang
-- libcurl4-openssl-dev
-- libssl-dev
-- pkg-config
-- Rust stable https://rustup.rs/
-- MySQL 5.7 (or compatible)
-    - libmysqlclient (brew install mysql on macOS, apt install libmysqlclient-dev on Ubuntu)
-
-
 Take a checkout of this repository, then run "make build" to pull in the
 necessary python package dependencies::
 

run-syncstorage-rs.sh

@@ -1,10 +0,0 @@
-if [ ! -d "syncstorage-rs" ]; then
-	echo "Downloading syncstorage-rs"
-	git clone https://github.com/mozilla-services/syncstorage-rs
-fi
-
-echo "Starting syncstorage-rs"
-
-cd syncstorage-rs
-
-SYNC_HUMAN_LOGS=1 RUST_LOG=trace cargo run

syncserver.ini

@@ -55,4 +55,4 @@ force_wsgi_environ = false
 # MySQL based syncstorage-rs 1.5 server hosted at http://localhost:8000/1.5
 
 # "{node}/1.5/{uid}"
-sync-1.5 = "http://localhost:8000/1.5/{uid}"
+# sync-1.5 = "http://localhost:8000/1.5/{uid}"

syncserver/__init__.py

@@ -5,7 +5,6 @@
 import binascii
 import os
 import logging
-import subprocess
 try:
     from urlparse import urlparse, urlunparse, urljoin
 except ImportError:
@@ -60,8 +59,6 @@ def includeme(config):
     if sqluri is None:
         rootdir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
         sqluri = "sqlite:///" + os.path.join(rootdir, "syncserver.db")
-    else:
-        os.environ['SYNC_DATABASE_URL'] = sqluri
 
     # Automagically configure from IdP if one is given.
     idp = settings.get("syncserver.identity_provider")
@@ -158,10 +155,7 @@ def includeme(config):
 
     # Include the relevant sub-packages.
     config.scan("syncserver", ignore=["syncserver.wsgi_app"])
-
-    os.environ['SYNC_MASTER_SECRET'] = secret
-    subprocess.call("/usr/bin/env sh run-syncstorage-rs.sh &", shell=True)
-
+    config.include("syncstorage", route_prefix="/storage")
     config.include("tokenserver", route_prefix="/token")
 
     # Add a top-level "it works!" view.