rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config/network: Prepare for multiple networks

Browse source 
This commit futures proofs the code to allow for usage of more than one
docker network.
This commit is contained in:
Tom Wiesing 2023-03-13 10:10:37 +01:00
parent db1989a299
commit e969351f8e
No known key found for this signature in database
13 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/config/template.go
View file

@ -22,8 +22,8 @@ type Template struct {
SQLAdminUsername string
SQLAdminPassword string
DockerNetworkName string
SessionSecret string
DockerNetworkPrefix string
SessionSecret string
}
// SetDefaults sets defaults on the template
@ -58,12 +58,12 @@ func (tpl *Template) SetDefaults() (err error) {
}
}
if tpl.DockerNetworkName == "" {
tpl.DockerNetworkName, err = password.Generate(rand.Reader, 10, passwordx.Identifier)
if tpl.DockerNetworkPrefix == "" {
tpl.DockerNetworkPrefix, err = password.Generate(rand.Reader, 10, passwordx.Identifier)
if err != nil {
return err
}
tpl.DockerNetworkName = `distillery-` + tpl.DockerNetworkName
tpl.DockerNetworkPrefix = `distillery-` + tpl.DockerNetworkPrefix
}
if tpl.SessionSecret == "" {
@ -93,7 +93,7 @@ func (tpl Template) Generate() Config {
ExtraDomains: []string{},
},
Docker: DockerConfig{
tpl.DockerNetworkName,
NetworkPrefix: tpl.DockerNetworkPrefix,
},
SQL: SQLConfig{
DatabaseConfig: DatabaseConfig{