Merge pull request #9 from nginxinc/newline-between-key-and-cert

Added a newline for a generated pem file btw key and crt
nginx · Mar 17, 2016 · 00391a2 · 00391a2
2 parents 66cc6d5 + b2dba78
commit 00391a2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/nginx-controller/nginx/nginx.go b/nginx-controller/nginx/nginx.go
@@ -109,11 +109,17 @@ func (nginx *NGINXController) AddOrUpdateCertAndKey(name string, cert string, ke
 		}
 		defer pem.Close()
 
-		_, err = pem.WriteString(string(key))
+		_, err = pem.WriteString(key)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}
-		_, err = pem.WriteString(string(cert))
+
+		_, err = pem.WriteString("\n")
+		if err != nil {
+			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
+		}
+
+		_, err = pem.WriteString(cert)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}

diff --git a/nginx-plus-controller/nginx/nginx.go b/nginx-plus-controller/nginx/nginx.go
@@ -149,11 +149,16 @@ func (nginx *NGINXController) AddOrUpdateCertAndKey(name string, cert string, ke
 		}
 		defer pem.Close()
 
-		_, err = pem.WriteString(string(key))
+		_, err = pem.WriteString(key)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}
-		_, err = pem.WriteString(string(cert))
+
+		_, err = pem.WriteString("\n")
+		if err != nil {
+			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
+		}
+		_, err = pem.WriteString(cert)
 		if err != nil {
 			glog.Fatalf("Couldn't write to pem file %v: %v", pemFileName, err)
 		}