From 57b12c8d4f456d20d1b56a45df4cfb830df11857 Mon Sep 17 00:00:00 2001
From: Sudheesh Singanamalla <sudheesh@cs.washington.edu>
Date: Tue, 11 May 2021 12:36:11 -0700
Subject: [PATCH] Setting go version for heroku build and disable need for
 CERT/KEY

- Heroku/Scalingo manage certificates for the deployments and the need
  for CERT, KEY cause issues due to Procfile limitations
- The issues are similar for GAE deployments
---
 Procfile       |  2 +-
 go.mod         |  2 ++
 odoh_server.go | 12 ++++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Procfile b/Procfile
index c0f90c9..92c66e4 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: ./bin/odoh-server
+web: ./bin/odoh-server-go
diff --git a/go.mod b/go.mod
index d610052..ecda512 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,7 @@
 module github.com/cloudflare/odoh-server-go
 
+// +heroku goVersion go1.14
+// +scalingo goVersion go1.14
 go 1.14
 
 require (
diff --git a/odoh_server.go b/odoh_server.go
index 0e77279..cbc54af 100644
--- a/odoh_server.go
+++ b/odoh_server.go
@@ -133,8 +133,10 @@ func main() {
 	}
 
 	var keyFile string
+	enableTLSServe := true
 	if keyFile = os.Getenv(keyEnvironmentVariable); keyFile == "" {
 		keyFile = "key.pem"
+		enableTLSServe = false
 	}
 
 	keyPair, err := odoh.CreateKeyPairFromSeed(kemID, kdfID, aeadID, seed)
@@ -189,6 +191,12 @@ func main() {
 	http.HandleFunc(configEndpoint, target.configHandler)
 	http.HandleFunc("/", server.indexHandler)
 
-	log.Printf("Listening on port %v with cert %v and key %v\n", port, certFile, keyFile)
-	log.Fatal(http.ListenAndServeTLS(fmt.Sprintf(":%s", port), certFile, keyFile, nil))
+	if enableTLSServe {
+		log.Printf("Listening on port %v with cert %v and key %v\n", port, certFile, keyFile)
+		log.Fatal(http.ListenAndServeTLS(fmt.Sprintf(":%s", port), certFile, keyFile, nil))
+	} else {
+		log.Printf("Listening on port %v without enabling TLS\n", port)
+		log.Fatal(http.ListenAndServe(fmt.Sprintf(":%s", port), nil))
+	}
+
 }