Hack in command-line specification of domain, cert and key

internal/imap/server.go

@@ -19,11 +19,13 @@ type Server interface {
 
 func NewServer(cancel context.CancelFunc, datastore store.Interface, starttls bool) Server {
 	out := &concrete{
-		cancel: cancel,
-		store:  datastore,
+		cancel:   cancel,
+		store:    datastore,
+		starttls: starttls,
 	}
 
 	out.server = imapserver.New(out)
+	out.server.TLSConfig = out.store.TLSConfig()
 
 	if starttls {
 		out.server.Addr = ":143"
@@ -35,13 +37,22 @@ func NewServer(cancel context.CancelFunc, datastore store.Interface, starttls bo
 }
 
 type concrete struct {
-	cancel context.CancelFunc
-	store  store.Interface
-	server *imapserver.Server
+	cancel   context.CancelFunc
+	store    store.Interface
+	server   *imapserver.Server
+	starttls bool
 }
 
 func (c *concrete) Run() {
-	if err := c.server.ListenAndServe(); err != nil {
+	var err error
+
+	if c.starttls {
+		err = c.server.ListenAndServe()
+	} else {
+		err = c.server.ListenAndServeTLS()
+	}
+
+	if err != nil {
 		log.Printf("Error serving IMAP %s: %v", c.server.Addr, err)
 	} else {
 		log.Printf("Stopped listening on IMAP %s", c.server.Addr)
@@ -56,7 +67,7 @@ func (c *concrete) Login(string, string) (imapbackend.User, error) {
 }
 
 func (c *concrete) Close() error {
-	c.cancel()  // FIXME: this doesn't touch the server
+	c.cancel() // FIXME: this doesn't touch the server
 
 	return nil
 }