3 files changed, 16 insertions, 2 deletions
diff --git a/internal/config/config.go b/internal/config/config.go
index 8a5e27a0c..b0263b170 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -170,6 +170,11 @@ func (c *Config) ParseCLIFlags(f KeyedFlags) error {
 		c.TemplateConfig.BaseDir = f.String(fn.TemplateBaseDir)
 	}
 
+	// template flags
+	if c.TemplateConfig.AssetBaseDir == "" || f.IsSet(fn.AssetBaseDir) {
+		c.TemplateConfig.AssetBaseDir = f.String(fn.AssetBaseDir)
+	}
+
 	// accounts flags
 	if f.IsSet(fn.AccountsOpenRegistration) {
 		c.AccountsConfig.OpenRegistration = f.Bool(fn.AccountsOpenRegistration)
@@ -283,6 +288,7 @@ type Flags struct {
 	DbDatabase string
 
 	TemplateBaseDir string
+	AssetBaseDir    string
 
 	AccountsOpenRegistration string
 	AccountsApprovalRequired string
@@ -326,6 +332,7 @@ type Defaults struct {
 	DbDatabase string
 
 	TemplateBaseDir string
+	AssetBaseDir    string
 
 	AccountsOpenRegistration bool
 	AccountsRequireApproval  bool
@@ -371,6 +378,7 @@ func GetFlagNames() Flags {
 		DbDatabase: "db-database",
 
 		TemplateBaseDir: "template-basedir",
+		AssetBaseDir:    "asset-basedir",
 
 		AccountsOpenRegistration: "accounts-open-registration",
 		AccountsApprovalRequired: "accounts-approval-required",
@@ -417,6 +425,7 @@ func GetEnvNames() Flags {
 		DbDatabase: "GTS_DB_DATABASE",
 
 		TemplateBaseDir: "GTS_TEMPLATE_BASEDIR",
+		AssetBaseDir:    "GTS_ASSET_BASEDIR",
 
 		AccountsOpenRegistration: "GTS_ACCOUNTS_OPEN_REGISTRATION",
 		AccountsApprovalRequired: "GTS_ACCOUNTS_APPROVAL_REQUIRED",
diff --git a/internal/config/default.go b/internal/config/default.go
index f63579753..8a53f239e 100644
--- a/internal/config/default.go
+++ b/internal/config/default.go
@@ -18,7 +18,8 @@ func TestDefault() *Config {
 			ApplicationName: defaults.ApplicationName,
 		},
 		TemplateConfig: &TemplateConfig{
-			BaseDir: defaults.TemplateBaseDir,
+			BaseDir:      defaults.TemplateBaseDir,
+			AssetBaseDir: defaults.AssetBaseDir,
 		},
 		AccountsConfig: &AccountsConfig{
 			OpenRegistration: defaults.AccountsOpenRegistration,
@@ -71,7 +72,8 @@ func Default() *Config {
 			ApplicationName: defaults.ApplicationName,
 		},
 		TemplateConfig: &TemplateConfig{
-			BaseDir: defaults.TemplateBaseDir,
+			BaseDir:      defaults.TemplateBaseDir,
+			AssetBaseDir: defaults.AssetBaseDir,
 		},
 		AccountsConfig: &AccountsConfig{
 			OpenRegistration: defaults.AccountsOpenRegistration,
@@ -124,6 +126,7 @@ func GetDefaults() Defaults {
 		DbDatabase: "postgres",
 
 		TemplateBaseDir: "./web/template/",
+		AssetBaseDir:    "./web/assets/",
 
 		AccountsOpenRegistration: true,
 		AccountsRequireApproval:  true,
diff --git a/internal/config/template.go b/internal/config/template.go
index eba86f8e6..9c524471c 100644
--- a/internal/config/template.go
+++ b/internal/config/template.go
@@ -22,4 +22,6 @@ package config
 type TemplateConfig struct {
 	// Directory from which gotosocial will attempt to load html templates (.tmpl files).
 	BaseDir string `yaml:"baseDir"`
+	// Directory from which static files are served
+	AssetBaseDir string `yaml:"assetDir"`
 }