From 0529a494ae6b541f917522a20de92e3d36615f65 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 21 Sep 2015 17:34:13 -0700
Subject: Adding image properties

---
 config/config.json | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index 4b0c0fe51..f9c49678f 100644
--- a/config/config.json
+++ b/config/config.json
@@ -18,8 +18,6 @@
         "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
         "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
         "AnalyticsUrl": "",
-        "UseLocalStorage": true,
-        "StorageDirectory": "./data/",
         "AllowedLoginAttempts": 10,
         "EnableOAuthServiceProvider": false
     },
@@ -34,20 +32,20 @@
         "Trace": false,
         "AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS"
     },
-    "AWSSettings": {
-        "S3AccessKeyId": "",
-        "S3SecretAccessKey": "",
-        "S3Bucket": "",
-        "S3Region": ""
-    },
     "ImageSettings": {
+        "DriverName": "local",
+        "Directory": "./data/",
         "ThumbnailWidth": 120,
         "ThumbnailHeight": 100,
         "PreviewWidth": 1024,
         "PreviewHeight": 0,
         "ProfileWidth": 128,
         "ProfileHeight": 128,
-        "InitialFont": "luximbi.ttf"
+        "InitialFont": "luximbi.ttf",
+        "AmazonS3AccessKeyId": "",
+        "AmazonS3SecretAccessKey": "",
+        "AmazonS3Bucket": "",
+        "AmazonS3Region": ""
     },
     "EmailSettings": {
         "AllowSignUpWithEmail": true,
-- 
cgit v1.2.3-1-g7c22