From ada84835eec1d69a962769afb590088d2f5a7d0a Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 16 Jul 2015 08:54:09 -0400 Subject: initial implementation of local server storage for files --- config/config.json | 4 +++- config/config_docker.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index e6025ef51..1ca7b66ec 100644 --- a/config/config.json +++ b/config/config.json @@ -19,7 +19,9 @@ "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6", "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", - "AnalyticsUrl": "" + "AnalyticsUrl": "", + "UseLocalStorage": true, + "StorageDirectory": "/mattermost/" }, "SqlSettings": { "DriverName": "mysql", diff --git a/config/config_docker.json b/config/config_docker.json index 9be837072..b7d7939ca 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -19,7 +19,9 @@ "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6", "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", - "AnalyticsUrl": "" + "AnalyticsUrl": "", + "UseLocalStorage": "", + "StorageDirectory": "/mattermost/" }, "SqlSettings": { "DriverName": "mysql", -- cgit v1.2.3-1-g7c22 From 1e7fe834e901043b12007219acff547fb7ae8ae0 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 17 Jul 2015 07:56:08 -0400 Subject: turned off local server storage by default --- config/config.json | 4 ++-- config/config_docker.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index 1ca7b66ec..a35303784 100644 --- a/config/config.json +++ b/config/config.json @@ -20,8 +20,8 @@ "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", - "UseLocalStorage": true, - "StorageDirectory": "/mattermost/" + "UseLocalStorage": false, + "StorageDirectory": "" }, "SqlSettings": { "DriverName": "mysql", diff --git a/config/config_docker.json b/config/config_docker.json index b7d7939ca..e2c7a093d 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -20,8 +20,8 @@ "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", - "UseLocalStorage": "", - "StorageDirectory": "/mattermost/" + "UseLocalStorage": false, + "StorageDirectory": "" }, "SqlSettings": { "DriverName": "mysql", -- cgit v1.2.3-1-g7c22 From edf26b4bc6f997d3dc2927b24e5787e6f66f2eb6 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 17 Jul 2015 12:26:18 -0400 Subject: create default storage directory in Dockerfile, turn on server storage by default for docker config --- config/config_docker.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config_docker.json b/config/config_docker.json index e2c7a093d..e862a6540 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -20,8 +20,8 @@ "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", - "UseLocalStorage": false, - "StorageDirectory": "" + "UseLocalStorage": true, + "StorageDirectory": "/mattermost/" }, "SqlSettings": { "DriverName": "mysql", -- cgit v1.2.3-1-g7c22 From 83ef05328f44494ff7ec3b7bcab3378f29e54605 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 20 Jul 2015 07:58:56 -0400 Subject: added relative data directory as default for storage and added it to gitignore --- config/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index a35303784..085dd6de6 100644 --- a/config/config.json +++ b/config/config.json @@ -20,8 +20,8 @@ "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", - "UseLocalStorage": false, - "StorageDirectory": "" + "UseLocalStorage": true, + "StorageDirectory": "./data/" }, "SqlSettings": { "DriverName": "mysql", -- cgit v1.2.3-1-g7c22 From 3fd5891a1aed6fadd0a8de31ec2b3f67da4c68cc Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 20 Jul 2015 08:00:07 -0400 Subject: change docker default storage directory to /mattermost/data --- config/config_docker.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config_docker.json b/config/config_docker.json index e862a6540..062cdef65 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -21,7 +21,7 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "UseLocalStorage": true, - "StorageDirectory": "/mattermost/" + "StorageDirectory": "/mattermost/data/" }, "SqlSettings": { "DriverName": "mysql", -- cgit v1.2.3-1-g7c22