Merge lp:~nataliabidart/magicicada-server/clean-deps-for-stable into lp:magicicada-server

[Natalia Bidart]

- Unified settings into a single file.
- Removed uneeded dependencies.
- Removed every outdated reference to "oauth".

[lp:~nataliabidart/magicicada-server/clean-deps-for-stable]

83. By Natalia Bidart on 2017-04-22

Missing replacement.

[Facundo Batista (facundo)]

Awesome, thanks!

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-10-01 12:48:16 +0000
+++ Makefile	2017-04-22 22:01:02 +0000
@@ -128,14 +128,12 @@
 version:
 	bzr version-info --format=python > lib/versioninfo.py || true
 
-start: build start-base start-filesync-dummy-group publish-api-port
-
-start-oauth: build start-base start-filesync-oauth-group publish-api-port
-
-resume: start-base start-filesync-oauth-group
-
-start-oauth-heapy:
-	USE_HEAPY=1 $(MAKE) start-oauth
+start: build start-base start-filesync-server-group publish-api-port
+
+resume: start-base start-filesync-server-group
+
+start-heapy:
+	USE_HEAPY=1 $(MAKE) start
 
 start-base:
 	$(MAKE) start-supervisor && $(MAKE) start-dbus || ( $(MAKE) stop ; exit 1 )
@@ -168,9 +166,9 @@
 	-@dev-scripts/supervisorctl-dev stop $*
 
 publish-api-port:
-	python -c 'from magicicada import settings; print >> file("tmp/filesyncserver.port", "w"), settings.api_server.TCP_PORT'
-	python -c 'from magicicada import settings; print >> file("tmp/filesyncserver.port.ssl", "w"), settings.ssl_proxy.PORT'
-	python -c 'from magicicada import settings; print >> file("tmp/filesyncserver-status.port", "w"), settings.api_server.STATUS_PORT'
+	python -c 'from magicicada import settings; print >> file("tmp/filesyncserver.port", "w"), settings.TCP_PORT'
+	python -c 'from magicicada import settings; print >> file("tmp/filesyncserver.port.ssl", "w"), settings.SSL_PORT'
+	python -c 'from magicicada import settings; print >> file("tmp/filesyncserver-status.port", "w"), settings.API_STATUS_PORT'
 
 shell:
 	$(DJANGO_MANAGE) shell
@@ -184,4 +182,4 @@
 .PHONY: sourcedeps link-sourcedeps build-sourcedeps build-deploy-sourcedeps \
 	build clean version lint test ci-test build-for-deployment \
 	clean-sourcedeps tarball start stop publish-api-port start-supervisor \
-	stop-supervisor start-dbus stop-dbus start-oauth start-oauth-heapy
+	stop-supervisor start-dbus stop-dbus start-heapy
 
=== modified file 'README.rst'
--- README.rst	2017-02-25 15:29:01 +0000
+++ README.rst	2017-04-22 22:01:02 +0000
@@ -139,7 +139,7 @@
 Start the server via command line this way::
 
     cd ~/magicicada/magicicada-server
-    make start-oauth
+    make start
 
 Note that the server will listen on port 21101, so you need to assure that the
 client could reach it (open the whole it in your firewall config, etc).
 
=== modified file 'config-manager.txt'
--- config-manager.txt	2016-12-27 21:57:00 +0000
+++ config-manager.txt	2017-04-22 22:01:02 +0000
@@ -24,10 +24,6 @@
 ./.sourcecode/configglue                  ~configglue/configglue/trunk;revno=1
 ./.sourcecode/dirspec                     ~ubuntuone-control-tower/dirspec/trunk;revno=14
 ./.sourcecode/django                      ~ubuntuone-pqm-team/django/stable;revno=17
-./.sourcecode/mock                        ~ubuntuone-pqm-team/python-mock/stable;revno=1
-./.sourcecode/oauthlib                    ~ubuntuone-pqm-team/oauthlib/stable;revno=209
-./.sourcecode/requests                    ~ubuntuone-pqm-team/requests/stable;revno=816
-./.sourcecode/requests_oauthlib           ~ubuntuone-pqm-team/requests-oauthlib/stable;revno=16
 ./.sourcecode/u1sync                      ~facundo/u1sync/opensourcing;revno=10
 ./.sourcecode/magicicada-client           ~chicharreros/magicicada-client/trunk;revno=1433
 ./.sourcecode/magicicada-protocol         ~chicharreros/magicicada-protocol/trunk;revno=169
 
=== modified file 'dependencies-devel.txt'
--- dependencies-devel.txt	2016-09-15 13:46:24 +0000
+++ dependencies-devel.txt	2017-04-22 22:01:02 +0000
@@ -4,6 +4,7 @@
 python-dbus
 python-gobject
 python-httplib2
+python-mock
 python-mocker
 python-pyinotify
 python-testtools
 
=== modified file 'dependencies.txt'
--- dependencies.txt	2016-02-20 17:42:06 +0000
+++ dependencies.txt	2017-04-22 22:01:02 +0000
@@ -15,8 +15,6 @@
 python-psutil
 python-psycopg2
 python-setuptools
-python-testresources
-python-transaction
 python-twisted-web
 python-tz
 python-virtualenv
 
=== modified file 'dev-scripts/cmd_client.py'
--- dev-scripts/cmd_client.py	2015-09-17 19:30:41 +0000
+++ dev-scripts/cmd_client.py	2017-04-22 22:01:02 +0000
@@ -719,7 +719,7 @@
     @parse_args(str, str)
     @require_connection
     @show_exception
-    def do_oauth(self):
+    def do_auth(self):
         """Perform authorisation."""
         self.defer_from_thread(self._auth)
 
 
=== modified file 'dev-scripts/deploy_api_server.py'
--- dev-scripts/deploy_api_server.py	2016-05-29 21:20:25 +0000
+++ dev-scripts/deploy_api_server.py	2017-04-22 22:01:02 +0000
@@ -55,7 +55,7 @@
     """Start the server."""
 
     status_port = int(
-        os.getenv('API_STATUS_PORT', settings.api_server.STATUS_PORT))
+        os.getenv('API_STATUS_PORT', settings.STATUS_PORT))
     service = server.create_service(status_port)
 
     yield service.startService()
 
=== modified file 'dev-scripts/dev_launcher.py'
--- dev-scripts/dev_launcher.py	2015-09-17 19:30:41 +0000
+++ dev-scripts/dev_launcher.py	2017-04-22 22:01:02 +0000
@@ -37,7 +37,7 @@
             "runs PROGNAME with args plus:\n"
             "     --port with the local server port\n"
             "     --host localhost\n"
-            "     --oauth keys for user USERNAME\n")
+            "     --auth username and password for user USERNAME\n")
 
 
 def main(args):
 
=== modified file 'dev-scripts/supervisor-dev.conf.tpl'
--- dev-scripts/supervisor-dev.conf.tpl	2016-06-03 00:35:53 +0000
+++ dev-scripts/supervisor-dev.conf.tpl	2017-04-22 22:01:02 +0000
@@ -24,7 +24,7 @@
 files=services-supervisor.conf workers-supervisor.conf
 
 [eventlistener:heartbeat]
-command=python %(basepath)s/lib/ubuntuone/supervisor/heartbeat_listener.py --interval=10 --timeout=20 --log_level=DEBUG --log_file=%(tmp_dir)s/heartbeat.log --groups=filesync-dummy,filesync-oauth
+command=python %(basepath)s/lib/ubuntuone/supervisor/heartbeat_listener.py --interval=10 --timeout=20 --log_level=DEBUG --log_file=%(tmp_dir)s/heartbeat.log --groups=filesync-server
 environment=PYTHONPATH="%(basepath)s:%(basepath)s/lib"
 events=PROCESS_COMMUNICATION,TICK_5
 buffer_size=42
@@ -36,15 +36,6 @@
 autostart=false
 stopsignal=INT
 
-[program:filesync-dummy-auth]
-command=python %(basepath)s/dev-scripts/deploy_api_server.py
-environment=PYTHONPATH="%(basepath)s:%(basepath)s/lib",DJANGO_SETTINGS_MODULE="magicicada.settings",PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-stdout_capture_maxbytes=16384
-autostart=false
-redirect_stderr=true                          ; send stderr to the log file
-stdout_logfile=%(tmp_dir)s/filesync.log
-stdout_logfile_maxbytes=0
-
 [program:ssl-proxy]
 command=/usr/bin/twistd --pidfile %(tmp_dir)s/ssl-proxy.pid -n -y %(basepath)s/magicicada/server/ssl_proxy.tac  --reactor=epoll
 environment=PYTHONPATH="%(basepath)s:%(basepath)s/lib",DJANGO_SETTINGS_MODULE="magicicada.settings"
@@ -52,8 +43,5 @@
 autostart=false
 stopsignal=INT
 
-[group:filesync-dummy]
-programs=filesync-dummy-auth
-
-[group:filesync-oauth]
+[group:filesync-server]
 programs=filesync,ssl-proxy
 
=== modified file 'magicicada/rpcdb/tests/test_backend.py'
--- magicicada/rpcdb/tests/test_backend.py	2016-11-07 01:37:46 +0000
+++ magicicada/rpcdb/tests/test_backend.py	2017-04-22 22:01:02 +0000
@@ -57,7 +57,7 @@
         self.assertEqual(result, dict(user_id=self.usr.id))
 
     def test_get_user_id_bad_auth(self):
-        """Bad parameters in the oauth request."""
+        """Bad parameters in the auth request."""
         bad_parameters = self.auth_parameters.copy()
         bad_parameters['password'] = "bad"
         try:
 
=== modified file 'magicicada/server/content.py'
--- magicicada/server/content.py	2016-11-07 01:37:46 +0000
+++ magicicada/server/content.py	2017-04-22 22:01:02 +0000
@@ -190,8 +190,8 @@
     def add_part(self, chunk_size):
         """Add a part to an upload job."""
         self.unsaved_count += chunk_size
-        if self.unsaved_count >= settings.api_server.STORAGE_CHUNK_SIZE:
-            self.unsaved_count -= settings.api_server.STORAGE_CHUNK_SIZE
+        if self.unsaved_count >= settings.STORAGE_CHUNK_SIZE:
+            self.unsaved_count -= settings.STORAGE_CHUNK_SIZE
             kwargs = dict(user_id=self.user.id, volume_id=self.volume_id,
                           uploadjob_id=self.uploadjob_id,
                           chunk_size=chunk_size)
@@ -870,7 +870,7 @@
         if upload is None:
             # no uploadjob found, create a new one: if the file is small just
             # get a bo
-            if deflated_size <= settings.api_server.STORAGE_CHUNK_SIZE:
+            if deflated_size <= settings.STORAGE_CHUNK_SIZE:
                 upload = BogusUploadJob()
             else:
                 try:
 
=== modified file 'magicicada/server/integration/run_integtests.py'
--- magicicada/server/integration/run_integtests.py	2016-08-30 00:50:31 +0000
+++ magicicada/server/integration/run_integtests.py	2017-04-22 22:01:02 +0000
@@ -48,11 +48,6 @@
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
 LIB_DIR = os.path.abspath("lib")
-
-# this should be done manually before:
-DEP_STARTOAUTH = """
-make start-oauth
-"""
 CLIENT_DIR = os.path.abspath(os.path.join('.sourcecode', 'magicicada-client'))
 PROTOCOL_DIR = os.path.abspath(
     os.path.join('.sourcecode', 'magicicada-protocol'))
@@ -101,7 +96,7 @@
     """
     couchdb_port = os.path.join(TMP_DIR, "couchdb-master0.port")
     if not os.path.exists(couchdb_port):
-        print "Not ready! Hint: did you do...?:\n" + DEP_STARTOAUTH
+        print "Not ready! Hint: did you run...?:\nmake start"
         return True
 
     log_conf = os.path.join(CLIENT_DIR, "data", "logging.conf")
 
=== modified file 'magicicada/server/server.py'
--- magicicada/server/server.py	2016-11-07 01:37:46 +0000
+++ magicicada/server/server.py	2017-04-22 22:01:02 +0000
@@ -285,8 +285,7 @@
         self.pending_requests = collections.deque()
         self.ping_loop = LoopingPing(StorageServer.PING_INTERVAL,
                                      StorageServer.PING_TIMEOUT,
-                                     settings.api_server.IDLE_TIMEOUT,
-                                     self)
+                                     settings.IDLE_TIMEOUT, self)
 
         # capabilities that the server is working with
         self.working_caps = MIN_CAP
@@ -624,7 +623,7 @@
 
     def __init__(self, protocol, message):
         """Create the request response."""
-        self.use_protocol_weakref = settings.api_server.PROTOCOL_WEAKREF
+        self.use_protocol_weakref = settings.PROTOCOL_WEAKREF
         self._protocol_ref = None
         super(BaseRequestResponse, self).__init__(protocol, message)
 
@@ -1841,7 +1840,7 @@
     def _get_upload_job(self):
         """Get the uploadjob."""
         share_id = self.convert_share_id(self.source_message.put_content.share)
-        if settings.api_server.MAGIC_UPLOAD_ACTIVE:
+        if settings.MAGIC_UPLOAD_ACTIVE:
             magic_hash = self.source_message.put_content.magic_hash or None
         else:
             magic_hash = None
@@ -1907,7 +1906,7 @@
         msg = self.source_message
         share_id = self.convert_share_id(msg.get_delta.share)
         from_generation = msg.get_delta.from_generation
-        delta_max_size = settings.api_server.DELTA_MAX_SIZE
+        delta_max_size = settings.DELTA_MAX_SIZE
         delta_info = yield self.protocol.user.get_delta(
             share_id, from_generation, limit=delta_max_size)
         nodes, vol_generation, free_bytes = delta_info
@@ -1942,7 +1941,7 @@
         """Build and send the DELTA_INFO for each node."""
         count = 0
         for node in nodes:
-            if count == settings.api_server.MAX_DELTA_INFO:
+            if count == settings.MAX_DELTA_INFO:
                 count = 0
                 yield
             message = protocol_pb2.Message()
@@ -1983,7 +1982,7 @@
     def _process(self):
         """Get all the live nodes and send DeltaInfos."""
         msg = self.source_message
-        limit = settings.api_server.GET_FROM_SCRATCH_LIMIT
+        limit = settings.GET_FROM_SCRATCH_LIMIT
         share_id = self.convert_share_id(msg.get_delta.share)
         # get the first chunk
         delta_info = yield self.protocol.user.get_from_scratch(
@@ -2333,7 +2332,7 @@
     @cvar protocol: The class of the server.
     """
     protocol = StorageServer
-    graceful_shutdown = settings.api_server.GRACEFUL_SHUTDOWN
+    graceful_shutdown = settings.GRACEFUL_SHUTDOWN
 
     def __init__(self, auth_provider_class=auth.DummyAuthProvider,
                  content_class=content.ContentManager,
@@ -2341,7 +2340,7 @@
         """Create a StorageServerFactory."""
         self.auth_provider = auth_provider_class(self)
         self.content = content_class(self)
-        self.diskstorage = DiskStorage(settings.api_server.STORAGE_BASEDIR)
+        self.diskstorage = DiskStorage(settings.STORAGE_BASEDIR)
 
         self.metrics = metrics.get_meter('root')
         self.user_metrics = metrics.get_meter('user')
@@ -2377,7 +2376,7 @@
 
         self.protocols = []
         self.reactor = reactor
-        self.trace_users = set(settings.api_server.TRACE_USERS)
+        self.trace_users = set(settings.TRACE_USERS)
 
         twisted.python.log.addObserver(self._deferror_handler)
 
@@ -2631,10 +2630,10 @@
         OrderedMultiService.__init__(self)
         self.heartbeat_writer = None
         if heartbeat_interval is None:
-            heartbeat_interval = float(settings.api_server.HEARTBEAT_INTERVAL)
+            heartbeat_interval = float(settings.HEARTBEAT_INTERVAL)
         self.heartbeat_interval = heartbeat_interval
         self.rpc_dal = None
-        self.servername = settings.api_server.SERVERNAME
+        self.servername = settings.API_SERVER_NAME
         logger.info('Starting %s', self.servername)
         logger.info(
             'protocol buffers implementation: %s',
@@ -2726,15 +2725,15 @@
             logger.debug('activated heapy remote monitor')
 
     # set GC's debug
-    if settings.api_server.GC_DEBUG:
+    if settings.GC_DEBUG:
         import gc
         gc.set_debug(gc.DEBUG_UNCOLLECTABLE)
         logger.debug('set gc debug on')
 
     if status_port is None:
-        status_port = settings.api_server.STATUS_PORT
+        status_port = settings.API_STATUS_PORT
 
     # create the service
     service = StorageServerService(
-        settings.api_server.TCP_PORT, auth_provider_class, status_port)
+        settings.TCP_PORT, auth_provider_class, status_port)
     return service
 
=== modified file 'magicicada/server/ssl_proxy.py'
--- magicicada/server/ssl_proxy.py	2016-08-08 01:14:41 +0000
+++ magicicada/server/ssl_proxy.py	2017-04-22 22:01:02 +0000
@@ -245,7 +245,7 @@
         self.status_service = create_status_service(self.factory, status_port)
         self.status_service.setServiceParent(self)
         # disable ssl compression
-        if settings.ssl_proxy.DISABLE_SSL_COMPRESSION:
+        if settings.DISABLE_SSL_COMPRESSION:
             disable_ssl_compression(logger)
 
     @property
@@ -265,7 +265,7 @@
         # setup stats in the factory
         yield MultiService.startService(self)
         # only start the HeartbeatWriter if the interval is > 0
-        heartbeat_interval = float(settings.ssl_proxy.HEARTBEAT_INTERVAL)
+        heartbeat_interval = float(settings.HEARTBEAT_INTERVAL)
         if heartbeat_interval > 0:
             self.heartbeat_writer = stdio.StandardIO(
                 supervisor_utils.HeartbeatWriter(heartbeat_interval, logger))
@@ -283,9 +283,9 @@
 
 def create_service():
     """Create the service instance."""
-    server_key = settings.api_server.KEY
-    server_crt = settings.api_server.CRT
-    server_crt_chain = settings.api_server.CRT_CHAIN
+    server_key = settings.CRT_KEY
+    server_crt = settings.CRT
+    server_crt_chain = settings.CRT_CHAIN
 
     ssl_cert = crypto.load_certificate(crypto.FILETYPE_PEM, server_crt)
     if server_crt_chain:
@@ -296,11 +296,11 @@
     ssl_key = crypto.load_privatekey(crypto.FILETYPE_PEM, server_key)
 
     ssl_proxy = ProxyService(ssl_cert, ssl_key, ssl_cert_chain,
-                             settings.ssl_proxy.PORT,
+                             settings.SSL_PORT,
                              '127.0.0.1',
-                             settings.api_server.TCP_PORT,
-                             settings.ssl_proxy.SERVER_NAME,
-                             settings.ssl_proxy.STATUS_PORT)
+                             settings.TCP_PORT,
+                             settings.SSL_SERVER_NAME,
+                             settings.SSL_STATUS_PORT)
     return ssl_proxy
 
 
 
=== modified file 'magicicada/server/testing/aq_helpers.py'
--- magicicada/server/testing/aq_helpers.py	2016-12-27 21:57:00 +0000
+++ magicicada/server/testing/aq_helpers.py	2017-04-22 22:01:02 +0000
@@ -332,8 +332,8 @@
                                                   0,  # port
                                                   "localhost", self.port,
                                                   "ssl-proxy-test", 0)
-        self.patch(settings.ssl_proxy, 'HEARTBEAT_INTERVAL',
-                   self.ssl_proxy_heartbeat_interval)
+        self.patch(
+            settings, 'HEARTBEAT_INTERVAL', self.ssl_proxy_heartbeat_interval)
         yield self.ssl_service.startService()
 
         if os.path.exists(self.tmpdir):
 
=== modified file 'magicicada/server/testing/testcase.py'
--- magicicada/server/testing/testcase.py	2016-12-27 21:57:00 +0000
+++ magicicada/server/testing/testcase.py	2017-04-22 22:01:02 +0000
@@ -43,9 +43,9 @@
 from magicicada.testing.testcase import BaseTestCase
 
 logger = logging.getLogger(__name__)
-server_key = settings.api_server.KEY
-server_crt = settings.api_server.CRT
-server_crt_chain = settings.api_server.CRT_CHAIN
+server_key = settings.CRT_KEY
+server_crt = settings.CRT
+server_crt_chain = settings.CRT_CHAIN
 
 
 class FakeTimestampChecker(object):
@@ -365,7 +365,7 @@
                 dummy_tokens[password] = user.id
 
         # tune the config for this tests
-        self.patch(settings.api_server, 'STORAGE_CHUNK_SIZE', 1024 * 64)
+        self.patch(settings, 'STORAGE_CHUNK_SIZE', 1024 * 64)
 
     def save_req(self, req, name):
         """Save a request for later use."""
 
=== modified file 'magicicada/server/tests/test_auth.py'
--- magicicada/server/tests/test_auth.py	2016-06-08 21:04:35 +0000
+++ magicicada/server/tests/test_auth.py	2017-04-22 22:01:02 +0000
@@ -96,7 +96,7 @@
 
     @defer.inlineCallbacks
     def test_authenticate(self):
-        """The OAuth provider succeeds with a valid PLAINTEXT signature."""
+        """The Auth provider succeeds with a valid password."""
         user = yield self.provider.authenticate(self.creds, None)
         self.assertEqual(user.id, self.usr0.id)
 
@@ -106,7 +106,7 @@
 
     @defer.inlineCallbacks
     def test_authenticate_failure(self):
-        """The OAuth provider succeeds with an invalid PLAINTEXT signature."""
+        """The Auth provider succeeds with an invalid password."""
         auth_parameters = self.creds.copy()
         auth_parameters['password'] = 'invalid'
 
@@ -115,7 +115,7 @@
 
     @defer.inlineCallbacks
     def test_authenticate_no_parameters(self):
-        """The OAuth provider fails with no parameters."""
+        """The Auth provider fails with no parameters."""
         user = yield self.provider.authenticate({}, None)
         self.assertEqual(user, None)
 
@@ -248,7 +248,7 @@
 
 
 class ClientSimpleAuthTests(ClientDummyAuthTests):
-    """Client authentication tests using the OAuth provider."""
+    """Client authentication tests using the Auth provider."""
 
     auth_provider_class = SimpleAuthProvider
 
 
=== modified file 'magicicada/server/tests/test_content.py'
--- magicicada/server/tests/test_content.py	2016-11-07 01:37:46 +0000
+++ magicicada/server/tests/test_content.py	2017-04-22 22:01:02 +0000
@@ -565,7 +565,7 @@
 
     def test_putcontent_cancel_middle(self):
         """Test putting content to a file and cancelling it in the middle."""
-        size = int(settings.api_server.STORAGE_CHUNK_SIZE * 1.5)
+        size = int(settings.STORAGE_CHUNK_SIZE * 1.5)
         data = os.urandom(size)
         deflated_data = zlib.compress(data)
         hash_object = content_hash_factory()
@@ -1146,7 +1146,7 @@
         Test that a PutContent fails and is terminated as soon we get an
         error, instead of wait until the full upload is done.
         """
-        chunk_size = settings.api_server.STORAGE_CHUNK_SIZE
+        chunk_size = settings.STORAGE_CHUNK_SIZE
         user, content_user = self._get_users(chunk_size ** 2)
         # create the file
         a_file = user.root.make_file(u"A new file")
@@ -1596,7 +1596,7 @@
         self.handler = self.add_memento_handler(server.logger, level=0)
         yield super(TestMultipartPutContent, self).setUp()
         # override defaults set by TestWithDatabase.setUp.
-        self.patch(settings.api_server, 'STORAGE_CHUNK_SIZE', 1024)
+        self.patch(settings, 'STORAGE_CHUNK_SIZE', 1024)
 
     def get_data(self, size):
         """Return random data of the specified size."""
@@ -1650,7 +1650,7 @@
     @defer.inlineCallbacks
     def test_resume_putcontent(self):
         """Test that the client can resume a putcontent request."""
-        self.patch(settings.api_server, 'STORAGE_CHUNK_SIZE', 1024 * 64)
+        self.patch(settings, 'STORAGE_CHUNK_SIZE', 1024 * 64)
         size = 2 * 1024 * 512
         StorageUser.objects.filter(id=self.usr0.id).update(
             max_storage_bytes=size * 2)
@@ -1776,7 +1776,7 @@
 
         It receives a new upload_id.
         """
-        self.patch(settings.api_server, 'STORAGE_CHUNK_SIZE', 1024 * 32)
+        self.patch(settings, 'STORAGE_CHUNK_SIZE', 1024 * 32)
         size = 2 * 1024 * 128
         StorageUser.objects.filter(id=self.usr0.id).update(
             max_storage_bytes=size * 2)
@@ -1848,7 +1848,7 @@
 
     def test_putcontent_corrupt(self):
         """Put content on a file with corrupt data."""
-        self.patch(settings.api_server, 'STORAGE_CHUNK_SIZE', 1024 * 64)
+        self.patch(settings, 'STORAGE_CHUNK_SIZE', 1024 * 64)
         size = 2 * 1024 * 512
         StorageUser.objects.filter(id=self.usr0.id).update(
             max_storage_bytes=size * 2)
@@ -1965,7 +1965,7 @@
         Test that a PutContent fails and is terminated as soon we get an
         error, instead of wait until the full upload is done.
         """
-        chunk_size = settings.api_server.STORAGE_CHUNK_SIZE
+        chunk_size = settings.STORAGE_CHUNK_SIZE
         user = self.make_user(max_storage_bytes=chunk_size ** 2)
         content_user = User(
             self.service.factory.content, user.id, user.root_volume_id,
@@ -2079,11 +2079,11 @@
         """Setup the test."""
         yield super(TestChunkedContent, self).setUp()
         # tune the config for this tests
-        self.patch(settings.api_server, 'STORAGE_CHUNK_SIZE', 1024 * 1024)
+        self.patch(settings, 'STORAGE_CHUNK_SIZE', 1024 * 1024)
 
     def test_putcontent_chunked(self, put_fail=False, get_fail=False):
         """Checks a chunked putcontent."""
-        size = int(settings.api_server.STORAGE_CHUNK_SIZE * 1.5)
+        size = int(settings.STORAGE_CHUNK_SIZE * 1.5)
         data = os.urandom(size)
         deflated_data = zlib.compress(data)
         hash_object = content_hash_factory()
@@ -2162,7 +2162,7 @@
 
     def test_deferred_add_part_to_uj(self):
         """Check that parts are added to upload job only after a limit."""
-        size = int(settings.api_server.STORAGE_CHUNK_SIZE * 2.5)
+        size = int(settings.STORAGE_CHUNK_SIZE * 2.5)
         data = os.urandom(size)
         deflated_data = zlib.compress(data)
         hash_object = content_hash_factory()
@@ -2344,7 +2344,7 @@
     def setUp(self):
         """Setup the test."""
         yield super(TestUploadJob, self).setUp()
-        self.chunk_size = settings.api_server.STORAGE_CHUNK_SIZE
+        self.chunk_size = settings.STORAGE_CHUNK_SIZE
         self.half_size = self.chunk_size / 2
         self.double_size = self.chunk_size * 2
         self.user = self.make_user(max_storage_bytes=self.chunk_size ** 2)
@@ -2673,7 +2673,7 @@
     def setUp(self):
         """Setup the test."""
         yield super(TestNode, self).setUp()
-        self.chunk_size = settings.api_server.STORAGE_CHUNK_SIZE
+        self.chunk_size = settings.STORAGE_CHUNK_SIZE
         self.half_size = self.chunk_size / 2
         self.double_size = self.chunk_size * 2
         self.user = self.make_user(max_storage_bytes=self.chunk_size ** 2)
@@ -3073,7 +3073,7 @@
     def test_add_part(self):
         """Test add_part method."""
         dbuj = yield self._make_uj()
-        chunk_size = int(settings.api_server.STORAGE_CHUNK_SIZE) + 1
+        chunk_size = int(settings.STORAGE_CHUNK_SIZE) + 1
         yield dbuj.add_part(chunk_size)
 
         # check it called rpc dal correctly
 
=== modified file 'magicicada/server/tests/test_generations.py'
--- magicicada/server/tests/test_generations.py	2016-05-29 20:58:45 +0000
+++ magicicada/server/tests/test_generations.py	2017-04-22 22:01:02 +0000
@@ -139,7 +139,7 @@
             yield client.dummy_authenticate("open sesame")
             # create some nodes to get a delta
             limit = 10
-            self.patch(server.settings.api_server, 'DELTA_MAX_SIZE', limit)
+            self.patch(server.settings, 'DELTA_MAX_SIZE', limit)
             for i in range(20):
                 self.usr0.root.make_file(u"name%s" % i)
             req = yield client.get_delta(request.ROOT, 5)
@@ -182,7 +182,7 @@
         def auth(client):
             yield client.dummy_authenticate("open sesame")
             # create some nodes to get a delta
-            self.patch(server.settings.api_server, 'MAX_DELTA_INFO', 5)
+            self.patch(server.settings, 'MAX_DELTA_INFO', 5)
             for i in range(20):
                 self.usr0.root.make_file(u"name%s" % i)
             req = yield client.get_delta(request.ROOT, 5)
@@ -248,7 +248,7 @@
         def auth(client):
             yield client.dummy_authenticate("open sesame")
             # create some nodes to get a delta
-            self.patch(server.settings.api_server, 'MAX_DELTA_INFO', 5)
+            self.patch(server.settings, 'MAX_DELTA_INFO', 5)
             for i in range(20):
                 self.usr0.root.make_file(u"name%s" % i)
             req = yield client.get_delta(request.ROOT, 5)
 
=== modified file 'magicicada/server/tests/test_server.py'
--- magicicada/server/tests/test_server.py	2016-11-07 01:37:46 +0000
+++ magicicada/server/tests/test_server.py	2017-04-22 22:01:02 +0000
@@ -349,7 +349,7 @@
 
     def test_protocol_ref_enabled(self):
         """Test that protocol weakref is disabled in tests."""
-        self.patch(settings.api_server, 'PROTOCOL_WEAKREF', True)
+        self.patch(settings, 'PROTOCOL_WEAKREF', True)
         _server = StorageServer()
         response = StorageServerRequestResponse(
             protocol=_server, message=self.make_protocol_message())
@@ -358,7 +358,7 @@
 
     def test_protocol_ref_disabled(self):
         """Test that protocol weakref is disabled in tests."""
-        self.patch(settings.api_server, 'PROTOCOL_WEAKREF', False)
+        self.patch(settings, 'PROTOCOL_WEAKREF', False)
         _server = StorageServer()
         response = StorageServerRequestResponse(
             protocol=_server, message=self.make_protocol_message())
@@ -2340,7 +2340,7 @@
 
     def test_reset_send_delta_info_counter(self):
         """Test that the count is reset on each iteration."""
-        self.patch(settings.api_server, 'MAX_DELTA_INFO', 5)
+        self.patch(settings, 'MAX_DELTA_INFO', 5)
         # create a few fake nodes
         nodes = []
         right_now = now()
@@ -2415,7 +2415,7 @@
     @defer.inlineCallbacks
     def test_chunked_get_from_scratch(self):
         """Get the nodes list in chunks."""
-        self.patch(settings.api_server, 'GET_FROM_SCRATCH_LIMIT', 5)
+        self.patch(settings, 'GET_FROM_SCRATCH_LIMIT', 5)
         # build fake nodes
         nodes = []
         right_now = now()
@@ -2612,7 +2612,7 @@
     def test_trace_users(self):
         """Check trace users are correctly set."""
         # set a specific config to test
-        self.patch(settings.api_server, 'TRACE_USERS', ['foo', 'bar', 'baz'])
+        self.patch(settings, 'TRACE_USERS', ['foo', 'bar', 'baz'])
         factory = StorageServerFactory()
         self.assertEqual(factory.trace_users, set(['foo', 'bar', 'baz']))
 
 
=== modified file 'magicicada/server/tests/test_ssl_proxy.py'
--- magicicada/server/tests/test_ssl_proxy.py	2016-08-14 20:40:09 +0000
+++ magicicada/server/tests/test_ssl_proxy.py	2017-04-22 22:01:02 +0000
@@ -54,8 +54,8 @@
             ssl_proxy.logger, level=logging.DEBUG)
         self.metrics = MetricReceiver()
         self.patch(metrics, 'get_meter', lambda n: self.metrics)
-        self.patch(settings.ssl_proxy, 'HEARTBEAT_INTERVAL',
-                   self.ssl_proxy_heartbeat_interval)
+        self.patch(
+            settings, 'HEARTBEAT_INTERVAL', self.ssl_proxy_heartbeat_interval)
 
     @defer.inlineCallbacks
     def test_start_stop(self):
@@ -87,8 +87,8 @@
         # keep metrics in our MetricReceiver
         self.metrics = MetricReceiver()
         self.patch(metrics, 'get_meter', lambda n: self.metrics)
-        self.patch(settings.ssl_proxy, 'HEARTBEAT_INTERVAL',
-                   self.ssl_proxy_heartbeat_interval)
+        self.patch(
+            settings, 'HEARTBEAT_INTERVAL', self.ssl_proxy_heartbeat_interval)
         yield self.ssl_service.startService()
         self.addCleanup(self.ssl_service.stopService)
 
 
=== modified file 'magicicada/settings/__init__.py'
--- magicicada/settings/__init__.py	2016-12-27 21:57:00 +0000
+++ magicicada/settings/__init__.py	2017-04-22 22:01:02 +0000
@@ -35,6 +35,18 @@
 
 from psycopg2.extensions import ISOLATION_LEVEL_REPEATABLE_READ
 
+
+def get_file_content(folder, filename):
+    filepath = os.path.join(folder, filename)
+    if not os.path.exists(filepath):
+        filepath = os.path.join(folder, 'dev-' + filename)
+
+    with open(filepath) as f:
+        content = f.read()
+
+    return content
+
+
 BASE_DIR = os.path.dirname(
     os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
@@ -216,8 +228,37 @@
 SYSLOG_FORMAT = (
     '%(processName)-13s %(levelname)-8s %(name)s[%(process)d]: %(message)s')
 
-from . import api_server  # noqa
-from . import ssl_proxy  # noqa
+
+# Server settings
+
+API_SERVER_NAME = 'filesync-server'
+API_STATUS_PORT = 21102
+CERTS_FOLDER = os.path.join(BASE_DIR, 'certs')
+# the `crt` key with the content of `cacert.pem` file
+CRT = get_file_content(CERTS_FOLDER, 'cacert.pem')
+CRT_CHAIN = None
+# the `key` key with the content of `privkey.pem` file
+CRT_KEY = get_file_content(CERTS_FOLDER, 'privkey.pem')
+DELTA_MAX_SIZE = 1000
+DISABLE_SSL_COMPRESSION = True
+GC_DEBUG = False
+GET_FROM_SCRATCH_LIMIT = 2000
+GRACEFUL_SHUTDOWN = True
+HEARTBEAT_INTERVAL = 5
+IDLE_TIMEOUT = 7200
+MAGIC_UPLOAD_ACTIVE = True
+MAX_DELTA_INFO = 20
+PROTOCOL_WEAKREF = False
+SSL_LOG_FILENAME = 'ssl-proxy.log'
+SSL_PORT = 21101
+SSL_SERVER_NAME = 'ssl-proxy'
+SSL_STATUS_PORT = 21103
+STATS_LOG_INTERVAL = 0
+STORAGE_CHUNK_SIZE = 5242880
+TCP_PORT = 21100
+TRACE_USERS = ['test', 'etc']
+UPLOAD_BUFFER_MAX_SIZE = 10485761
+STORAGE_BASEDIR = os.path.join(BASE_DIR, 'tmp', 'filestorage')
 
 
 try:
 
=== removed file 'magicicada/settings/api_server.py'
--- magicicada/settings/api_server.py	2016-05-29 23:43:14 +0000
+++ magicicada/settings/api_server.py	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# Copyright 2008-2015 Canonical
-# Copyright 2015 Chicharreros (https://launchpad.net/~chicharreros)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# For further info, check  http://launchpad.net/filesync-server
-
-import os
-from django.conf import settings
-
-
-def get_file_content(folder, filename):
-    filepath = os.path.join(folder, filename)
-    if not os.path.exists(filepath):
-        filepath = os.path.join(folder, 'dev-' + filename)
-
-    with open(filepath) as f:
-        content = f.read()
-
-    return content
-
-
-CERTS_FOLDER = os.path.join(settings.BASE_DIR, 'certs')
-# the `crt` key with the content of `cacert.pem` file
-CRT = get_file_content(CERTS_FOLDER, 'cacert.pem')
-CRT_CHAIN = None
-# the `key` key with the content of `privkey.pem` file
-KEY = get_file_content(CERTS_FOLDER, 'privkey.pem')
-DELTA_MAX_SIZE = 1000
-GC_DEBUG = True
-GET_FROM_SCRATCH_LIMIT = 2000
-GRACEFUL_SHUTDOWN = True
-HEARTBEAT_INTERVAL = 5
-IDLE_TIMEOUT = 7200
-MAGIC_UPLOAD_ACTIVE = True
-MAX_DELTA_INFO = 20
-METRICS_NAMESPACE = 'development.filesync.server'
-PROTOCOL_WEAKREF = False
-SERVERNAME = 'filesyncserver-development'
-SLI_METRIC_NAMESPACE = None
-STATS_LOG_INTERVAL = 0
-STATUS_PORT = 21102
-STORAGE_CHUNK_SIZE = 5242880
-TCP_PORT = 21100
-TRACE_USERS = ['test', 'etc']
-UPLOAD_BUFFER_MAX_SIZE = 10485761
-STORAGE_BASEDIR = os.path.join(settings.BASE_DIR, 'tmp', 'filestorage')
 
=== removed file 'magicicada/settings/ssl_proxy.py'
--- magicicada/settings/ssl_proxy.py	2016-05-31 22:59:18 +0000
+++ magicicada/settings/ssl_proxy.py	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# Copyright 2008-2015 Canonical
-# Copyright 2015-2016 Chicharreros (https://launchpad.net/~chicharreros)
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# For further info, check  http://launchpad.net/filesync-server
-
-DISABLE_SSL_COMPRESSION = True
-HEARTBEAT_INTERVAL = 5
-LOG_FILENAME = 'ssl-proxy.log'
-PORT = 21101
-SERVER_NAME = 'ssl-proxy-dev'
-STATUS_PORT = 21103