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

Move runtime around

Browse source
This commit is contained in:
Tom Wiesing 2022-09-14 14:42:21 +02:00
parent ef1243ea39
commit feacd4eeae
No known key found for this signature in database
18 changed files with 39 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/wisski/component.go
View file

@ -72,9 +72,9 @@ func makeComponent[C component.Component](dis *Distillery, field *C, init func(C
return *field
}
// Components returns all components of the distillery
func (dis *Distillery) Components() []component.Component {
return []component.Component{
// Components returns all components that have a stack function
func (dis *Distillery) Components() []component.ComponentWithStack {
return []component.ComponentWithStack{
dis.Web(),
dis.Self(),
dis.Resolver(),

2
internal/wisski/instances.go
View file

@ -242,7 +242,7 @@ func (instance Instance) Stack() component.Installable {
"LETSENCRYPT_HOST": instance.dis.Config.IfHttps(instance.Domain()),
"LETSENCRYPT_EMAIL": instance.dis.Config.IfHttps(instance.dis.Config.CertbotEmail),
"RUNTIME_DIR": instance.dis.RuntimeDir(),
"RUNTIME_DIR": instance.dis.Config.RuntimeDir(),
"GLOBAL_AUTHORIZED_KEYS_FILE": instance.dis.Config.GlobalAuthorizedKeysFile,
},

8
internal/wisski/runtime.go
View file

@ -1,8 +0,0 @@
package wisski
import "path/filepath"
// RuntimeDir returns the path to the runtime directory
func (dis *Distillery) RuntimeDir() string {
return filepath.Join(dis.Config.DeployRoot, "runtime")
}