From cb8688f4298a1a3ed5e28565004588be3c071df0 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 20 Dec 2021 15:19:53 +0100
Subject: Remove unnecessary storage config variables (#344)

* rewire config to not use extraneous serve vars

* rename 'file' to 'local' for consistency

* use Type and Size again
---
 internal/config/defaults.go |  5 +----
 internal/config/keys.go     | 10 ++--------
 internal/config/values.go   |  5 +----
 3 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'internal/config')

diff --git a/internal/config/defaults.go b/internal/config/defaults.go
index f1666e1a5..4b6ca5ea7 100644
--- a/internal/config/defaults.go
+++ b/internal/config/defaults.go
@@ -55,10 +55,7 @@ var Defaults = Values{
 	MediaDescriptionMaxChars: 500,
 
 	StorageBackend:       "local",
-	StorageBasePath:      "/gotosocial/storage",
-	StorageServeProtocol: "https",
-	StorageServeHost:     "localhost",
-	StorageServeBasePath: "/fileserver",
+	StorageLocalBasePath: "/gotosocial/storage",
 
 	StatusesMaxChars:           5000,
 	StatusesCWMaxChars:         100,
diff --git a/internal/config/keys.go b/internal/config/keys.go
index a451a8dc6..c3c46745f 100644
--- a/internal/config/keys.go
+++ b/internal/config/keys.go
@@ -61,10 +61,7 @@ type KeyNames struct {
 
 	// storage
 	StorageBackend       string
-	StorageBasePath      string
-	StorageServeProtocol string
-	StorageServeHost     string
-	StorageServeBasePath string
+	StorageLocalBasePath string
 
 	// statuses
 	StatusesMaxChars           string
@@ -143,10 +140,7 @@ var Keys = KeyNames{
 	MediaDescriptionMaxChars: "media-description-max-chars",
 
 	StorageBackend:       "storage-backend",
-	StorageBasePath:      "storage-base-path",
-	StorageServeProtocol: "storage-serve-protocol",
-	StorageServeHost:     "storage-serve-host",
-	StorageServeBasePath: "storage-serve-base-path",
+	StorageLocalBasePath: "storage-local-base-path",
 
 	StatusesMaxChars:           "statuses-max-chars",
 	StatusesCWMaxChars:         "statuses-cw-max-chars",
diff --git a/internal/config/values.go b/internal/config/values.go
index a8ffed1af..c1d2946f5 100644
--- a/internal/config/values.go
+++ b/internal/config/values.go
@@ -53,10 +53,7 @@ type Values struct {
 	MediaDescriptionMaxChars int
 
 	StorageBackend       string
-	StorageBasePath      string
-	StorageServeProtocol string
-	StorageServeHost     string
-	StorageServeBasePath string
+	StorageLocalBasePath string
 
 	StatusesMaxChars           int
 	StatusesCWMaxChars         int
-- 
cgit v1.3