summaryrefslogtreecommitdiff
path: root/modules/caddytls
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2020-03-07 11:47:55 -0700
committerMatthew Holt <mholt@users.noreply.github.com>2020-03-07 11:47:55 -0700
commit217419f6d97885daf0fb8832a407626e578523f0 (patch)
treee3fd05343ae5eb1c74a6cf171503d5957cf0d466 /modules/caddytls
parent4d18587192e4fffe5b34b714eaabcfc212914c1e (diff)
tls: Couple of quick fixes for 4d18587192e4fffe5b34b714eaabcfc212914c1e
Diffstat (limited to 'modules/caddytls')
-rw-r--r--modules/caddytls/tls.go12
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/caddytls/tls.go b/modules/caddytls/tls.go
index a7cd54e..4fa126e 100644
--- a/modules/caddytls/tls.go
+++ b/modules/caddytls/tls.go
@@ -678,13 +678,14 @@ const automateKey = "automate"
func (t *TLS) moveCertificates() error {
log := t.logger.Named("automigrate")
- oldAcmeDir := filepath.Join(caddy.AppDataDir(), "acme")
+ baseDir := caddy.AppDataDir()
// if custom storage path was defined, use that instead
- if fs, ok := t.ctx.Storage().(*certmagic.FileStorage); ok {
- oldAcmeDir = fs.Path
+ if fs, ok := t.ctx.Storage().(*certmagic.FileStorage); ok && fs.Path != "" {
+ baseDir = fs.Path
}
+ oldAcmeDir := filepath.Join(baseDir, "acme")
oldAcmeCas, err := ioutil.ReadDir(oldAcmeDir)
if err != nil {
if os.IsNotExist(err) {
@@ -705,10 +706,11 @@ func (t *TLS) moveCertificates() error {
for _, oldCA := range oldCANames {
// make new destination path
newCAName := oldCA
- if strings.Contains(oldCA, "api.letsencrypt.org") {
+ if strings.Contains(oldCA, "api.letsencrypt.org") &&
+ !strings.HasSuffix(oldCA, "-directory") {
newCAName += "-directory"
}
- newBaseDir := filepath.Join(caddy.AppDataDir(), "certificates", newCAName)
+ newBaseDir := filepath.Join(baseDir, "certificates", newCAName)
err := os.MkdirAll(newBaseDir, 0700)
if err != nil {
return fmt.Errorf("making new certs directory: %v", err)