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

Move to yaml-based configuration

Browse source 
This commit updates the configuration to be yaml-based and updates the
configuration to read in a yaml file.
This commit is contained in:
Tom Wiesing 2023-02-12 18:13:52 +01:00
parent 568c005d15
commit 945329a080
No known key found for this signature in database
70 changed files with 1150 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/wisski/ingredient/barrel/stack.go
View file

@ -23,14 +23,14 @@ func (barrel *Barrel) Stack() component.StackWithResources {
EnvPath: filepath.Join("barrel.env"),
EnvContext: map[string]string{
"DOCKER_NETWORK_NAME": barrel.Malt.Config.DockerNetworkName,
"DOCKER_NETWORK_NAME": barrel.Malt.Config.Docker.Network,
"SLUG": barrel.Slug,
"VIRTUAL_HOST": barrel.Domain(),
"HTTPS_ENABLED": barrel.Malt.Config.HTTPSEnabledEnv(),
"HTTPS_ENABLED": barrel.Malt.Config.HTTP.HTTPSEnabledEnv(),
"DATA_PATH": filepath.Join(barrel.FilesystemBase, "data"),
"RUNTIME_DIR": barrel.Malt.Config.RuntimeDir(),
"RUNTIME_DIR": barrel.Malt.Config.Paths.RuntimeDir(),
},
MakeDirs: []string{"data", ".composer"},

2
internal/wisski/ingredient/php/extras/prefixes.go
View file

@ -82,7 +82,7 @@ func (wisski *Prefixes) database(ctx context.Context, server *phpx.Server) (pref
func (prefixes *Prefixes) blocked() ([]string, error) {
// open the resolver block file
// TODO: move this to the distillery
file, err := prefixes.Malt.Environment.Open(prefixes.Malt.Config.SelfResolverBlockFile)
file, err := prefixes.Malt.Environment.Open(prefixes.Malt.Config.Paths.ResolverBlocks)
if err != nil {
return nil, err
}

4
internal/wisski/ingredient/reserve/reserve.go
View file

@ -30,11 +30,11 @@ func (reserve *Reserve) Stack() component.StackWithResources {
EnvPath: filepath.Join("reserve.env"),
EnvContext: map[string]string{
"DOCKER_NETWORK_NAME": reserve.Malt.Config.DockerNetworkName,
"DOCKER_NETWORK_NAME": reserve.Malt.Config.Docker.Network,
"SLUG": reserve.Slug,
"VIRTUAL_HOST": reserve.Domain(),
"HTTPS_ENABLED": reserve.Malt.Config.HTTPSEnabledEnv(),
"HTTPS_ENABLED": reserve.Malt.Config.HTTP.HTTPSEnabledEnv(),
},
}
}

4
internal/wisski/liquid/domain.go
View file

@ -6,7 +6,7 @@ import (
// Domain returns the full domain name of this WissKI
func (liquid *Liquid) Domain() string {
return liquid.Config.HostFromSlug(liquid.Slug)
return liquid.Config.HTTP.HostFromSlug(liquid.Slug)
}
// URL returns the public URL of this instance
@ -18,7 +18,7 @@ func (liquid *Liquid) URL() *url.URL {
}
// use http or https scheme depending on if the distillery has it enabled
if liquid.Malt.Config.HTTPSEnabled() {
if liquid.Malt.Config.HTTP.HTTPSEnabled() {
url.Scheme = "https"
} else {
url.Scheme = "http"