Accept full_cert_filename and priv_cert_filename in config to enable TLS. Use with --addr :443 command-line option [#1]

Author: karmakaze

config/config.go

@@ -58,6 +58,8 @@ type Config struct {
 	Repos                 map[string]*Repo `json:"repos"`
 	MaxConcurrentIndexers int              `json:"max-concurrent-indexers"`
 	HealthCheckURI        string           `json:"health-check-uri"`
+	FullCertFilename      string           `json:"full_cert_filename"`
+	PrivCertFilename      string           `json:"priv_cert_filename"`
 }
 
 // SecretMessage is just like json.RawMessage but it will not
@@ -145,6 +147,23 @@ func (c *Config) LoadFromFile(filename string) error {
 		c.DbPath = path
 	}
 
+	if !filepath.IsAbs(c.FullCertFilename) {
+		path, err := filepath.Abs(
+			filepath.Join(filepath.Dir(filename), c.FullCertFilename))
+		if err != nil {
+			return err
+		}
+		c.FullCertFilename = path
+	}
+	if !filepath.IsAbs(c.PrivCertFilename) {
+		path, err := filepath.Abs(
+			filepath.Join(filepath.Dir(filename), c.PrivCertFilename))
+		if err != nil {
+			return err
+		}
+		c.PrivCertFilename = path
+	}
+
 	for _, repo := range c.Repos {
 		initRepo(repo)
 	}

web/web.go

@@ -61,7 +61,19 @@ func Start(cfg *config.Config, addr string, dev bool) *Server {
 	}
 
 	go func() {
-		ch <- http.ListenAndServe(addr, s)
+		if cfg.FullCertFilename != "" && cfg.PrivCertFilename != "" {
+			err := http.ListenAndServeTLS(addr, cfg.FullCertFilename, cfg.PrivCertFilename, s)
+			if err != nil {
+				fmt.Printf("ListenAndServeTLS %s: %v\n", addr, err)
+			}
+			ch <- err
+		} else {
+			err := http.ListenAndServe(addr, s)
+			if err != nil {
+				fmt.Printf("ListenAndServe %s: %v\n", addr, err)
+			}
+			ch <- err
+		}
 	}()
 
 	return s