fix mixed up certificate and key folders (#7)

This commit is contained in:
Stephan Müller 2019-04-15 01:36:29 +02:00 committed by Ludovic Fernandez
parent fd35bd4f94
commit adc829627d

View File

@ -97,7 +97,7 @@ func dump(acmeFile, dumpPath string, crtInfo, keyInfo fileInfo, domainSubDir boo
} }
func writeCert(dumpPath string, cert *Certificate, info fileInfo, domainSubDir bool) error { func writeCert(dumpPath string, cert *Certificate, info fileInfo, domainSubDir bool) error {
certPath := filepath.Join(dumpPath, keysSubDir, cert.Domain.Main+info.Ext) certPath := filepath.Join(dumpPath, certsSubDir, cert.Domain.Main+info.Ext)
if domainSubDir { if domainSubDir {
certPath = filepath.Join(dumpPath, cert.Domain.Main, info.Name+info.Ext) certPath = filepath.Join(dumpPath, cert.Domain.Main, info.Name+info.Ext)
if err := os.MkdirAll(filepath.Join(dumpPath, cert.Domain.Main), 0755); err != nil { if err := os.MkdirAll(filepath.Join(dumpPath, cert.Domain.Main), 0755); err != nil {
@ -109,7 +109,7 @@ func writeCert(dumpPath string, cert *Certificate, info fileInfo, domainSubDir b
} }
func writeKey(dumpPath string, cert *Certificate, info fileInfo, domainSubDir bool) error { func writeKey(dumpPath string, cert *Certificate, info fileInfo, domainSubDir bool) error {
keyPath := filepath.Join(dumpPath, certsSubDir, cert.Domain.Main+info.Ext) keyPath := filepath.Join(dumpPath, keysSubDir, cert.Domain.Main+info.Ext)
if domainSubDir { if domainSubDir {
keyPath = filepath.Join(dumpPath, cert.Domain.Main, info.Name+info.Ext) keyPath = filepath.Join(dumpPath, cert.Domain.Main, info.Name+info.Ext)
if err := os.MkdirAll(filepath.Join(dumpPath, cert.Domain.Main), 0755); err != nil { if err := os.MkdirAll(filepath.Join(dumpPath, cert.Domain.Main), 0755); err != nil {