summaryrefslogtreecommitdiff
path: root/internal/config
diff options
context:
space:
mode:
Diffstat (limited to 'internal/config')
-rw-r--r--internal/config/defaults.go5
-rw-r--r--internal/config/keys.go10
-rw-r--r--internal/config/values.go5
3 files changed, 4 insertions, 16 deletions
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