Dockerfile

@@ -1,24 +0,0 @@
-#Start multistage Docker
-#Stage 1 : build brutalinks
-
-
-FROM golang:latest AS zangbuilder
-RUN apt install make  git -y
-RUN mkdir -p /go/src/zangtumb
-RUN git clone https://git.keinpfusch.net/loweel/zangtumb.git /go/src/zangtumb 
-WORKDIR /go/src/zangtumb
-ENV GO111MODULE=auto 
-RUN go build 
-
-
-#Start multistage Docker
-#Stage 2 : put pieces together
-
-FROM debian:latest 
-RUN apt update
-RUN apt upgrade -y
-RUN apt install ca-certificates -y
-RUN mkdir -p /opt/zangtumb
-WORKDIR  /opt/zangtumb
-COPY --from=zangbuilder /go/src/zangtumb /opt/zangtumb/
-ENTRYPOINT ["/opt/zangtumb/zangtumb"]

smtpd/smtp.go

@@ -259,11 +259,6 @@ loop:
 			to = nil
 			buffer.Reset()
 		case "MAIL":
-
-		    log.Println("TlsConfigExists: " , s.srv.TLSConfig != nil)
-			log.Println("TLS_Required: " , s.srv.TLSRequired)
-			log.Println("We Are in Clear: ", !s.tls)
-		    
 			if s.srv.TLSConfig != nil && s.srv.TLSRequired && !s.tls {
 				s.writef("530 5.7.0 Must issue a STARTTLS command first")
 				break

zangtumb.go

@@ -38,9 +38,10 @@ func init() {
 	if os.Getenv("USETLS") == "true" {
 		log.Println("Preparing TLS Keys")
 		ZMakecert()
+		ZangSmtpServer.ConfigureTLS(CrtFile, KeyFile)
 		ZangSmtpServer.TLSListener = false
 		ZangSmtpServer.TLSRequired = true
-		log.Println("Using TLS: ", ZangSmtpServer.TLSRequired)
+		log.Println("Using TLS")
 
 	} else {
 
@@ -59,8 +60,6 @@ func main() {
 
 	log.Println("Starting the server....")
 
-	ZangSmtpServer.ConfigureTLS(CrtFile, KeyFile)
-
 	defer log.Println("Shutting down the server")
 
 	if err := smtpd.ListenAndServe(ListenAddr, mailHandler, handlerRcpt, AppName, ServerName, ZangSmtpServer); err != nil {