Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

acme_server: switch to bbolt storage (#3868)

Browse source 
* acme_server: switch to bbolt storage

There have been some issues with the badger storage engine
being used by the embedded acme_server. This will replace
the storage engine with bbolt

* Switch database path back to acme_server/db and remove if directory
This commit is contained in:
Ian 2020-11-23 12:03:58 -08:00 committed by GitHub
parent c6dec30535
commit 06ba006f9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/caddypki/acmeserver/acmeserver.go
View file

@ -32,6 +32,7 @@ import (
"github.com/smallstep/certificates/authority/provisioner"
"github.com/smallstep/certificates/db"
"github.com/smallstep/nosql"
"go.uber.org/zap"
)
func init() {
@ -77,6 +78,7 @@ func (Handler) CaddyModule() caddy.ModuleInfo {
// Provision sets up the ACME server handler.
func (ash *Handler) Provision(ctx caddy.Context) error {
logger := ctx.Logger(ash)
// set some defaults
if ash.CA == "" {
ash.CA = caddypki.DefaultCAID
@ -99,7 +101,8 @@ func (ash *Handler) Provision(ctx caddy.Context) error {
return fmt.Errorf("no certificate authority configured with id: %s", ash.CA)
}
dbFolder := filepath.Join(caddy.AppDataDir(), "acme_server", "db")
dbFolder := filepath.Join(caddy.AppDataDir(), "acme_server")
dbPath := filepath.Join(dbFolder, "db")
// TODO: See https://github.com/smallstep/nosql/issues/7
err = os.MkdirAll(dbFolder, 0755)
@ -107,6 +110,18 @@ func (ash *Handler) Provision(ctx caddy.Context) error {
return fmt.Errorf("making folder for ACME server database: %v", err)
}
// Check to see if previous db exists
var stat os.FileInfo
stat, err = os.Stat(dbPath)
if stat != nil && err == nil {
// A badger db is found and should be removed
if stat.IsDir() {
logger.Warn("Found an old badger database and removing it",
zap.String("path", dbPath))
_ = os.RemoveAll(dbPath)
}
}
authorityConfig := caddypki.AuthorityConfig{
AuthConfig: &authority.AuthConfig{
Provisioners: provisioner.List{
@ -122,8 +137,8 @@ func (ash *Handler) Provision(ctx caddy.Context) error {
},
},
DB: &db.Config{
Type: "badger",
DataSource: dbFolder,
Type: "bbolt",
DataSource: dbPath,
},
}