Upstream/pages-server
2
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2024-06-04 10:10:54 +02:00
Code Issues Projects Releases Wiki Activity

make pogreb config and move code

Browse Source
This commit is contained in:
6543 2023-02-09 14:21:26 +01:00
parent 513e79832a
commit 3166b05107
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/certs.go
View File

@ -24,11 +24,20 @@ var Certs = &cli.Command{
Action: removeCert,
},
},
Flags: []cli.Flag{
// Cert Storage
// TODO: remove in next version
&cli.StringFlag{
// DEPRICATED
Name: "db-pogreb",
Value: "key-database.pogreb",
EnvVars: []string{"DB_POGREB"},
},
},
}
func listCerts(ctx *cli.Context) error {
// TODO: make "key-database.pogreb" set via flag
keyDatabase, err := database.New("key-database.pogreb")
keyDatabase, err := database.NewPogreb(ctx.String("db-pogreb"))
if err != nil {
return fmt.Errorf("could not create database: %v", err)
}
@ -53,8 +62,7 @@ func removeCert(ctx *cli.Context) error {
domains := ctx.Args().Slice()
// TODO: make "key-database.pogreb" set via flag
keyDatabase, err := database.New("key-database.pogreb")
keyDatabase, err := database.NewPogreb(ctx.String("db-pogreb"))
if err != nil {
return fmt.Errorf("could not create database: %v", err)
}

9
cmd/flags.go
View File

@ -120,4 +120,13 @@ var ServeFlags = []cli.Flag{
// TODO: Usage
EnvVars: []string{"DNS_PROVIDER"},
},
// Cert Storage
// TODO: remove in next version
&cli.StringFlag{
// DEPRICATED
Name: "db-pogreb",
Value: "key-database.pogreb",
EnvVars: []string{"DB_POGREB"},
},
}

15
cmd/main.go
View File

@ -74,6 +74,14 @@ func Serve(ctx *cli.Context) error {
mainDomainSuffix = "." + mainDomainSuffix
}
// Init ssl cert database
dbPogrebDB := ctx.String("db-pogreb")
certDB, err := database.NewPogreb(dbPogrebDB)
if err != nil {
return fmt.Errorf("could not create database: %v", err)
}
defer certDB.Close() //nolint:errcheck // database has no close ... sync behave like it
keyCache := cache.NewKeyValueCache()
challengeCache := cache.NewKeyValueCache()
// canonicalDomainCache stores canonical domains
@ -104,13 +112,6 @@ func Serve(ctx *cli.Context) error {
return fmt.Errorf("couldn't create listener: %v", err)
}
// TODO: make "key-database.pogreb" set via flag
certDB, err := database.New("key-database.pogreb")
if err != nil {
return fmt.Errorf("could not create database: %v", err)
}
defer certDB.Close() //nolint:errcheck // database has no close ... sync behave like it
listener = tls.NewListener(listener, certificates.TLSConfig(mainDomainSuffix,
giteaClient,
dnsProvider,

2
server/database/setup.go → server/database/pogreb.go
View File

@ -82,7 +82,7 @@ func (p aDB) sync() {
}
}
func New(path string) (CertDB, error) {
func NewPogreb(path string) (CertDB, error) {
if path == "" {
return nil, fmt.Errorf("path not set")
}