Merge pull request #5 from arduino/fix-certs

matteosuppo · matteosuppo · commit e3fc11b9c8e4 · 2015-06-16T13:08:25.000+02:00
Fix cert path for installer

Former-commit-id: db750b9f5646bc4f99ac09da4fb02288f9316bd6 [formerly 004e5901f053b0b9fd6d91317e6322a01dcbaff5]
Former-commit-id: 8daf346652684a81ec015f873a38535b0eb24cb4
diff --git a/main.go b/main.go
@@ -204,7 +204,7 @@ func main() {
 			http.HandleFunc("/ws", wsHandler)
 			http.HandleFunc("/upload", uploadHandler)
 
-			if err := http.ListenAndServeTLS(*addrSSL, "cert.pem", "key.pem", nil); err != nil {
+			if err := http.ListenAndServeTLS(*addrSSL, filepath.Join(dest, "cert.pem"), filepath.Join(dest, "key.pem"), nil); err != nil {
 				fmt.Printf("Error trying to bind to port: %v, so exiting...", err)
 				log.Fatal("Error ListenAndServe:", err)
 			}

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ func main() {`
`204`	`204`	`http.HandleFunc("/ws", wsHandler)`
`205`	`205`	`http.HandleFunc("/upload", uploadHandler)`
`206`	`206`
`207`		`- if err := http.ListenAndServeTLS(*addrSSL, "cert.pem", "key.pem", nil); err != nil {`
	`207`	`+ if err := http.ListenAndServeTLS(*addrSSL, filepath.Join(dest, "cert.pem"), filepath.Join(dest, "key.pem"), nil); err != nil {`
`208`	`208`	`fmt.Printf("Error trying to bind to port: %v, so exiting...", err)`
`209`	`209`	`log.Fatal("Error ListenAndServe:", err)`
`210`	`210`	`}`