phew big stuff!!!!

internal/config/config.go

@@ -35,6 +35,7 @@ type Config struct {
 	TemplateConfig  *TemplateConfig `yaml:"template"`
 	AccountsConfig  *AccountsConfig `yaml:"accounts"`
 	MediaConfig     *MediaConfig    `yaml:"media"`
+	StorageConfig   *StorageConfig  `yaml:"storage"`
 }
 
 // FromFile returns a new config from a file, or an error if something goes amiss.
@@ -62,6 +63,9 @@ func Empty() *Config {
 	return &Config{
 		DBConfig:       &DBConfig{},
 		TemplateConfig: &TemplateConfig{},
+		AccountsConfig: &AccountsConfig{},
+		MediaConfig:    &MediaConfig{},
+		StorageConfig:  &StorageConfig{},
 	}
 }
 
@@ -147,6 +151,36 @@ func (c *Config) ParseCLIFlags(f KeyedFlags) {
 	if f.IsSet(fn.AccountsRequireApproval) {
 		c.AccountsConfig.RequireApproval = f.Bool(fn.AccountsRequireApproval)
 	}
+
+	// media flags
+	if c.MediaConfig.MaxImageSize == 0 || f.IsSet(fn.MediaMaxImageSize) {
+		c.MediaConfig.MaxImageSize = f.Int(fn.MediaMaxImageSize)
+	}
+
+	if c.MediaConfig.MaxVideoSize == 0 || f.IsSet(fn.MediaMaxVideoSize) {
+		c.MediaConfig.MaxVideoSize = f.Int(fn.MediaMaxVideoSize)
+	}
+
+	// storage flags
+	if c.StorageConfig.Backend == "" || f.IsSet(fn.StorageBackend) {
+		c.StorageConfig.Backend = f.String(fn.StorageBackend)
+	}
+
+	if c.StorageConfig.BasePath == "" || f.IsSet(fn.StorageBasePath) {
+		c.StorageConfig.BasePath = f.String(fn.StorageBasePath)
+	}
+
+	if c.StorageConfig.ServeProtocol == "" || f.IsSet(fn.StorageServeProtocol) {
+		c.StorageConfig.ServeProtocol = f.String(fn.StorageServeProtocol)
+	}
+
+	if c.StorageConfig.ServeHost == "" || f.IsSet(fn.StorageServeHost) {
+		c.StorageConfig.ServeHost = f.String(fn.StorageServeHost)
+	}
+
+	if c.StorageConfig.ServeBasePath == "" || f.IsSet(fn.StorageServeBasePath) {
+		c.StorageConfig.ServeBasePath = f.String(fn.StorageServeBasePath)
+	}
 }
 
 // KeyedFlags is a wrapper for any type that can store keyed flags and give them back.
@@ -166,15 +200,27 @@ type Flags struct {
 	ConfigPath               string
 	Host                     string
 	Protocol                 string
+
 	DbType                   string
 	DbAddress                string
 	DbPort                   string
 	DbUser                   string
 	DbPassword               string
 	DbDatabase               string
+
 	TemplateBaseDir          string
+
 	AccountsOpenRegistration string
 	AccountsRequireApproval  string
+
+	MediaMaxImageSize        string
+	MediaMaxVideoSize        string
+
+	StorageBackend           string
+	StorageBasePath          string
+	StorageServeProtocol     string
+	StorageServeHost         string
+	StorageServeBasePath     string
 }
 
 // GetFlagNames returns a struct containing the names of the various flags used for
@@ -186,15 +232,27 @@ func GetFlagNames() Flags {
 		ConfigPath:               "config-path",
 		Host:                     "host",
 		Protocol:                 "protocol",
+
 		DbType:                   "db-type",
 		DbAddress:                "db-address",
 		DbPort:                   "db-port",
 		DbUser:                   "db-user",
 		DbPassword:               "db-password",
 		DbDatabase:               "db-database",
+
 		TemplateBaseDir:          "template-basedir",
+
 		AccountsOpenRegistration: "accounts-open-registration",
 		AccountsRequireApproval:  "accounts-require-approval",
+
+		MediaMaxImageSize:        "media-max-image-size",
+		MediaMaxVideoSize:        "media-max-video-size",
+
+		StorageBackend:           "storage-backend",
+		StorageBasePath:          "storage-base-path",
+		StorageServeProtocol:     "storage-serve-protocol",
+		StorageServeHost:         "storage-serve-host",
+		StorageServeBasePath:     "storage-serve-base-path",
 	}
 }
 
@@ -207,14 +265,26 @@ func GetEnvNames() Flags {
 		ConfigPath:               "GTS_CONFIG_PATH",
 		Host:                     "GTS_HOST",
 		Protocol:                 "GTS_PROTOCOL",
+
 		DbType:                   "GTS_DB_TYPE",
 		DbAddress:                "GTS_DB_ADDRESS",
 		DbPort:                   "GTS_DB_PORT",
 		DbUser:                   "GTS_DB_USER",
 		DbPassword:               "GTS_DB_PASSWORD",
 		DbDatabase:               "GTS_DB_DATABASE",
+
 		TemplateBaseDir:          "GTS_TEMPLATE_BASEDIR",
+
 		AccountsOpenRegistration: "GTS_ACCOUNTS_OPEN_REGISTRATION",
 		AccountsRequireApproval:  "GTS_ACCOUNTS_REQUIRE_APPROVAL",
+
+		MediaMaxImageSize:        "GTS_MEDIA_MAX_IMAGE_SIZE",
+		MediaMaxVideoSize:        "GTS_MEDIA_MAX_VIDEO_SIZE",
+
+		StorageBackend:           "GTS_STORAGE_BACKEND",
+		StorageBasePath:          "GTS_STORAGE_BASE_PATH",
+		StorageServeProtocol:     "GTS_STORAGE_SERVE_PROTOCOL",
+		StorageServeHost:         "GTS_STORAGE_SERVE_HOST",
+		StorageServeBasePath:     "GTS_STORAGE_SERVE_BASE_PATH",
 	}
 }

internal/config/media.go

@@ -18,7 +18,10 @@
 
 package config
 
-// AccountsConfig contains configuration to do with creating accounts, new registrations, and defaults.
+// MediaConfig contains configuration for receiving and parsing media files and attachments
 type MediaConfig struct {
-	MaxImageSize int64 `yaml:"maxImageSize"`
+	// Max size of uploaded images in bytes
+	MaxImageSize int `yaml:"maxImageSize"`
+	// Max size of uploaded video in bytes
+	MaxVideoSize int `yaml:"maxVideoSize"`
 }

internal/config/storage.go

@@ -0,0 +1,36 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package config
+
+// StorageConfig contains configuration for storage and serving of media files and attachments
+type StorageConfig struct {
+	// Type of storage backend to use: currently only 'local' is supported.
+	// TODO: add S3 support here.
+	Backend string `yaml:"backend"`
+
+	// The base path for storing things. Should be an already-existing directory.
+	BasePath string `yaml:"basePath"`
+
+	// Protocol to use when *serving* media files from storage
+	ServeProtocol string `yaml:"serveProtocol"`
+	// Host to use when *serving* media files from storage
+	ServeHost string `yaml:"serveHost"`
+	// Base path to use when *serving* media files from storage
+	ServeBasePath string `yaml:"serveBasePath"`
+}