Merge remote-tracking branch 'origin/master' into waltermitty

Conflicts:
	app.py
	data/userfiles.py

config.py

@@ -83,20 +83,12 @@ class DefaultConfig(object):
   BUILDLOGS_REDIS_HOSTNAME = 'logs.quay.io'
   BUILDLOGS_OPTIONS = []
 
-  # Build logs archive
-  LOG_ARCHIVE_TYPE = 'LocalArchivedLogs'
-  LOG_ARCHIVE_PATH = 'test/data/registry/logarchive'
-
   # Real-time user events
   USER_EVENTS_REDIS_HOSTNAME = 'logs.quay.io'
 
   # Stripe config
   BILLING_TYPE = 'FakeStripe'
 
-  # Userfiles
-  USERFILES_TYPE = 'LocalUserfiles'
-  USERFILES_PATH = 'test/data/registry/userfiles'
-
   # Analytics
   ANALYTICS_TYPE = 'FakeAnalytics'
 
@@ -176,3 +168,11 @@ class DefaultConfig(object):
   }
 
   DISTRIBUTED_STORAGE_PREFERENCE = ['local_us']
+
+  # Userfiles
+  USERFILES_LOCATION = 'local_us'
+  USERFILES_PATH = 'userfiles/'
+
+  # Build logs archive
+  LOG_ARCHIVE_LOCATION = 'local_us'
+  LOG_ARCHIVE_PATH = 'logarchive/'