Skip to content
Snippets Groups Projects
Commit a5477d77 authored by godog's avatar godog
Browse files

Switch to certbot pem names

Easier to swap between the two.
parent a32c41b4
1 merge request!1Switch to certbot pem names
Pipeline #3274 passed
...@@ -125,7 +125,7 @@ func TestManager_NewCert(t *testing.T) { ...@@ -125,7 +125,7 @@ func TestManager_NewCert(t *testing.T) {
if _, err := os.Stat(p); err != nil { if _, err := os.Stat(p); err != nil {
t.Fatalf("file not created: %v", err) t.Fatalf("file not created: %v", err)
} }
p = filepath.Join(m.configDirs[0], "../certs/example.com/private_key.pem") p = filepath.Join(m.configDirs[0], "../certs/example.com/privkey.pem")
if _, err := os.Stat(p); err != nil { if _, err := os.Stat(p); err != nil {
t.Fatalf("file not created: %v", err) t.Fatalf("file not created: %v", err)
} }
......
...@@ -25,7 +25,7 @@ type dirStorage struct { ...@@ -25,7 +25,7 @@ type dirStorage struct {
func (d *dirStorage) GetCert(cn string) ([][]byte, crypto.Signer, error) { func (d *dirStorage) GetCert(cn string) ([][]byte, crypto.Signer, error) {
certPath := filepath.Join(d.root, cn, "fullchain.pem") certPath := filepath.Join(d.root, cn, "fullchain.pem")
keyPath := filepath.Join(d.root, cn, "private_key.pem") keyPath := filepath.Join(d.root, cn, "privkey.pem")
der, err := parseCertsFromFile(certPath) der, err := parseCertsFromFile(certPath)
if err != nil { if err != nil {
...@@ -53,7 +53,7 @@ func (d *dirStorage) PutCert(cn string, der [][]byte, key crypto.Signer) error { ...@@ -53,7 +53,7 @@ func (d *dirStorage) PutCert(cn string, der [][]byte, key crypto.Signer) error {
for path, data := range filemap { for path, data := range filemap {
var mode os.FileMode = 0644 var mode os.FileMode = 0644
if strings.HasSuffix(path, "private_key.pem") { if strings.HasSuffix(path, "privkey.pem") {
mode = 0400 mode = 0400
} }
log.Printf("writing %s (%03o)", path, mode) log.Printf("writing %s (%03o)", path, mode)
...@@ -83,7 +83,7 @@ func dumpCertsAndKey(cn string, der [][]byte, key crypto.Signer) (map[string][]b ...@@ -83,7 +83,7 @@ func dumpCertsAndKey(cn string, der [][]byte, key crypto.Signer) (map[string][]b
if err != nil { if err != nil {
return nil, err return nil, err
} }
m[filepath.Join(cn, "private_key.pem")] = data m[filepath.Join(cn, "privkey.pem")] = data
return m, nil return m, nil
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment