mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 14:42:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow different host + accountDomain (#103)

Browse source 
* allow different host + accountDomain

* use accountDomain in tags
This commit is contained in:
Tobi Smethurst 2021-07-19 18:42:08 +02:00 • committed by GitHub
commit b1a4f38e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/config/config.go
View file

@ -48,6 +48,7 @@ type Config struct {
LogLevel string `yaml:"logLevel"`
ApplicationName string `yaml:"applicationName"`
Host string `yaml:"host"`
AccountDomain string `yaml:"accountDomain"`
Protocol string `yaml:"protocol"`
DBConfig *DBConfig `yaml:"db"`
TemplateConfig *TemplateConfig `yaml:"template"`
@ -133,6 +134,13 @@ func (c *Config) ParseCLIFlags(f KeyedFlags, version string) error {
return errors.New("host was not set")
}
if c.AccountDomain == "" || f.IsSet(fn.AccountDomain) {
c.AccountDomain = f.String(fn.AccountDomain)
}
if c.AccountDomain == "" {
c.AccountDomain = c.Host // default to whatever the host is, if this is empty
}
if c.Protocol == "" || f.IsSet(fn.Protocol) {
c.Protocol = f.String(fn.Protocol)
}
@ -290,6 +298,7 @@ type Flags struct {
ApplicationName string
ConfigPath string
Host string
AccountDomain string
Protocol string
DbType string
@ -336,6 +345,7 @@ type Defaults struct {
ApplicationName string
ConfigPath string
Host string
AccountDomain string
Protocol string
SoftwareVersion string
@ -385,6 +395,7 @@ func GetFlagNames() Flags {
ApplicationName: "application-name",
ConfigPath: "config-path",
Host: "host",
AccountDomain: "account-domain",
Protocol: "protocol",
DbType: "db-type",
@ -434,6 +445,7 @@ func GetEnvNames() Flags {
ApplicationName: "GTS_APPLICATION_NAME",
ConfigPath: "GTS_CONFIG_PATH",
Host: "GTS_HOST",
AccountDomain: "GTS_ACCOUNT_DOMAIN",
Protocol: "GTS_PROTOCOL",
DbType: "GTS_DB_TYPE",