X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sms-service%2Fsrc%2Fsms%2Fsms.go;h=fea6b109286206a99051602b8c9b392a2e548038;hb=ab6708f3627b8763848cd09d31d7dd1382dda7dc;hp=de9d0a7d00589a4d3d34f4e3cc4e142be9855956;hpb=70329f54da15d773718e6de13f51b42d02d5f1a1;p=aaf%2Fsms.git

diff --git a/sms-service/src/sms/sms.go b/sms-service/src/sms/sms.go
index de9d0a7..fea6b10 100644
--- a/sms-service/src/sms/sms.go
+++ b/sms-service/src/sms/sms.go
@@ -47,16 +47,9 @@ func main() {
 
 	httpRouter := smshandler.CreateRouter(backendImpl)
 
-	// TODO: Use CA certificate from AAF
-	tlsConfig, err := smsauth.GetTLSConfig(smsConf.CAFile)
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	httpServer := &http.Server{
-		Handler:   httpRouter,
-		Addr:      ":10443",
-		TLSConfig: tlsConfig,
+		Handler: httpRouter,
+		Addr:    ":10443",
 	}
 
 	// Listener for SIGINT so that it returns cleanly
@@ -69,7 +62,21 @@ func main() {
 		close(connectionsClose)
 	}()
 
-	err = httpServer.ListenAndServeTLS(smsConf.ServerCert, smsConf.ServerKey)
+	// Start in TLS mode by default
+	if smsConf.DisableTLS == true {
+		smslogger.WriteWarn("TLS is Disabled")
+		err = httpServer.ListenAndServe()
+	} else {
+		// TODO: Use CA certificate from AAF
+		tlsConfig, err := smsauth.GetTLSConfig(smsConf.CAFile)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		httpServer.TLSConfig = tlsConfig
+		err = httpServer.ListenAndServeTLS(smsConf.ServerCert, smsConf.ServerKey)
+	}
+
 	if err != nil && err != http.ErrServerClosed {
 		log.Fatal(err)
 	}