From e0f0bfb0eafe7b97a62ad9d1b44191dd33817ee2 Mon Sep 17 00:00:00 2001
From: Oliver Matthews <oliver@codersoffortune.net>
Date: Wed, 26 Feb 2014 11:49:15 +0000
Subject: [PATCH] revert settings.persistorManager

---
 services/filestore/app/coffee/PersistorManager.coffee       | 6 +++---
 services/filestore/config/settings.development.coffee       | 2 +-
 .../filestore/test/unit/coffee/PersistorManagerTests.coffee | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/filestore/app/coffee/PersistorManager.coffee b/services/filestore/app/coffee/PersistorManager.coffee
index 7bd55c47dd..e0266e64af 100644
--- a/services/filestore/app/coffee/PersistorManager.coffee
+++ b/services/filestore/app/coffee/PersistorManager.coffee
@@ -2,9 +2,9 @@ settings = require("settings-sharelatex")
 logger = require("logger-sharelatex")
 S3PersistorManager = require("./S3PersistorManager")
 
-logger.log backend:settings.persistorManager, "Loading backend"
-module.exports = switch settings.persistorManager
+logger.log backend:settings.filestoreBackend, "Loading backend"
+module.exports = switch settings.filestoreBackend
 	when "s3",null
 		S3PersistorManager
 	else
-		throw new Error( "Unknown filestore backend: #{settings.persistorManager}" )
+		throw new Error( "Unknown filestore backend: #{settings.filestoreBackend}" )
diff --git a/services/filestore/config/settings.development.coffee b/services/filestore/config/settings.development.coffee
index b8bebc6b31..a2a1b5cc26 100644
--- a/services/filestore/config/settings.development.coffee
+++ b/services/filestore/config/settings.development.coffee
@@ -8,7 +8,7 @@ module.exports =
 	# current options are:
 	# "s3" - Amazon S3
 	# if no persistor is chosen, s3 will be used by default
-	persistorManager: "s3"
+	filestoreBackend: "s3"
 
 	# ShareLaTeX stores binary files like images in S3.
 	# Fill in your Amazon S3 credentials below.
diff --git a/services/filestore/test/unit/coffee/PersistorManagerTests.coffee b/services/filestore/test/unit/coffee/PersistorManagerTests.coffee
index e82700cf1a..af11fa7408 100644
--- a/services/filestore/test/unit/coffee/PersistorManagerTests.coffee
+++ b/services/filestore/test/unit/coffee/PersistorManagerTests.coffee
@@ -22,7 +22,7 @@ describe "PersistorManagerTests", ->
 	describe "test s3 mixin", ->
 		beforeEach ->
 			@settings =
-				persistorManager: "s3"
+				filestoreBackend: "s3"
 			@requires =
 				"./S3PersistorManager": @S3PersistorManager
 				"settings-sharelatex": @settings
@@ -81,7 +81,7 @@ describe "PersistorManagerTests", ->
 	describe "test invalid mixins", ->
 		it "should not load an invalid wrapper", (done) ->
 			@settings =
-				persistorManager:"magic"
+				filestoreBackend:"magic"
 			@requires =
 				"./S3PersistorManager": @S3PersistorManager
 				"settings-sharelatex": @settings