use user system config to store tls artifacts

This commit is contained in:
A.Unger
2021-06-07 15:00:52 +02:00
parent e11e286d33
commit 2508ce0ef7
10 changed files with 90 additions and 40 deletions
+7 -2
View File
@@ -1,6 +1,10 @@
package flagset
import (
"path"
"github.com/ProtonMail/go-appdir"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/glauth/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/flags"
@@ -45,6 +49,7 @@ func HealthWithConfig(cfg *config.Config) []cli.Flag {
// ServerWithConfig applies cfg to the root flagset
func ServerWithConfig(cfg *config.Config) []cli.Flag {
dirs := appdir.New("ldap")
return []cli.Flag{
&cli.StringFlag{
Name: "log-file",
@@ -158,14 +163,14 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "ldaps-cert",
Value: flags.OverrideDefaultString(cfg.Ldaps.Cert, "./ldap.crt"),
Value: flags.OverrideDefaultString(cfg.Ldaps.Cert, path.Join(dirs.UserConfig(), "ldap.crt")),
Usage: "path to ldaps certificate in PEM format",
EnvVars: []string{"GLAUTH_LDAPS_CERT"},
Destination: &cfg.Ldaps.Cert,
},
&cli.StringFlag{
Name: "ldaps-key",
Value: flags.OverrideDefaultString(cfg.Ldaps.Key, "./ldap.key"),
Value: flags.OverrideDefaultString(cfg.Ldaps.Key, path.Join(dirs.UserConfig(), "ldap.key")),
Usage: "path to ldaps key in PEM format",
EnvVars: []string{"GLAUTH_LDAPS_KEY"},
Destination: &cfg.Ldaps.Key,