From 9f9de389d5e2567c1ee58b79dc51a00cc7f4eaf1 Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Sat, 17 Oct 2015 21:18:46 -0600
Subject: [PATCH] lego provides PEM-encoded certificate bytes for us

---
 config/letsencrypt/crypto.go      | 13 -------------
 config/letsencrypt/letsencrypt.go |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/config/letsencrypt/crypto.go b/config/letsencrypt/crypto.go
index 5c84b4e41..3322cc1ca 100644
--- a/config/letsencrypt/crypto.go
+++ b/config/letsencrypt/crypto.go
@@ -8,19 +8,6 @@ import (
 	"os"
 )
 
-// saveCertificate saves a DER-encoded (binary format) certificate
-// to file.
-func saveCertificate(certBytes []byte, file string) error {
-	pemCert := pem.Block{Type: "CERTIFICATE", Bytes: certBytes}
-	certOut, err := os.Create(file)
-	if err != nil {
-		return err
-	}
-	pem.Encode(certOut, &pemCert)
-	certOut.Close()
-	return nil
-}
-
 // loadRSAPrivateKey loads a PEM-encoded RSA private key from file.
 func loadRSAPrivateKey(file string) (*rsa.PrivateKey, error) {
 	keyBytes, err := ioutil.ReadFile(file)
diff --git a/config/letsencrypt/letsencrypt.go b/config/letsencrypt/letsencrypt.go
index 93f402c14..2e8a173e4 100644
--- a/config/letsencrypt/letsencrypt.go
+++ b/config/letsencrypt/letsencrypt.go
@@ -144,7 +144,7 @@ func saveCertsAndKeys(certificates []acme.CertificateResource) error {
 		os.MkdirAll(storage.Site(cert.Domain), 0700)
 
 		// Save cert
-		err := saveCertificate(cert.Certificate, storage.SiteCertFile(cert.Domain))
+		err := ioutil.WriteFile(storage.SiteCertFile(cert.Domain), cert.Certificate, 0600)
 		if err != nil {
 			return err
 		}