faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-23 15:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set wd to /run/faasd

Browse Source 
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2020-01-05 09:05:21 +00:00
committed by Alex Ellis
parent fd4f53fe15
commit 3068d03279
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/install.go
View File

@ -23,6 +23,11 @@ func runInstall(_ *cobra.Command, _ []string) error {
return errors.Wrap(basicAuthErr, "cannot create basic-auth-* files") return errors.Wrap(basicAuthErr, "cannot create basic-auth-* files")
} }
wd := "/run/faasd"
if err := ensureWorkingDir(wd); err != nil {
return err
}
err := binExists("/usr/local/bin/", "faas-containerd") err := binExists("/usr/local/bin/", "faas-containerd")
if err != nil { if err != nil {
return err return err
@ -38,12 +43,12 @@ func runInstall(_ *cobra.Command, _ []string) error {
return err return err
} }
err = systemd.InstallUnit("faas-containerd") err = systemd.InstallUnit("faas-containerd", wd)
if err != nil { if err != nil {
return err return err
} }
err = systemd.InstallUnit("faasd") err = systemd.InstallUnit("faasd", wd)
if err != nil { if err != nil {
return err return err
} }
@ -83,3 +88,14 @@ func binExists(folder, name string) error {
} }
return nil return nil
} }
func ensureWorkingDir(folder string) error {
if _, err := os.Stat(folder); err != nil {
err = os.MkdirAll("/run/faasd", 0600)
if err != nil {
return err
}
}
return nil
}

2
hack/faas-containerd.service
View File

@ -7,7 +7,7 @@ MemoryLimit=500M
ExecStart=/usr/local/bin/faas-containerd ExecStart=/usr/local/bin/faas-containerd
Restart=on-failure Restart=on-failure
RestartSec=10s RestartSec=10s
WorkingDirectory=/usr/local/bin/ WorkingDirectory={{.Cwd}}
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

10
pkg/systemd/systemd.go
View File

@ -64,7 +64,12 @@ func DaemonReload() error {
return nil return nil
} }
func InstallUnit(name string) error { func InstallUnit(name, folder string) error {
if len(folder) == 0 {
wd, _ := os.Getwd()
folder = wd
}
tmplName := "./hack/" + name + ".service" tmplName := "./hack/" + name + ".service"
tmpl, err := template.ParseFiles(tmplName) tmpl, err := template.ParseFiles(tmplName)
@ -72,12 +77,11 @@ func InstallUnit(name string) error {
return fmt.Errorf("error loading template %s, error %s", tmplName, err) return fmt.Errorf("error loading template %s, error %s", tmplName, err)
} }
wd, _ := os.Getwd()
var tpl bytes.Buffer var tpl bytes.Buffer
userData := struct { userData := struct {
Cwd string Cwd string
}{ }{
Cwd: wd, Cwd: folder,
} }
err = tmpl.Execute(&tpl, userData) err = tmpl.Execute(&tpl, userData)