Changeset 62 in code

Timestamp:

Feb 18, 2020, 1:10:23 PM (5 years ago)

Author:

contact

Message:

Add config file

Location:

trunk

Files:

• cmd/jounce/main.go (modified) (3 diffs)
• config (added)
• config/config.go (added)

trunk/cmd/jounce/main.go

@@ -2 +2 @@
 
 import (
+        "crypto/tls"
         "flag"
         "log"
@@ -7 +8 @@
 
         "git.sr.ht/~emersion/jounce"
+        "git.sr.ht/~emersion/jounce/config"
 )
 
 func main() {
-        var addr, hostname string
-        flag.StringVar(&addr, "addr", ":6667", "listening address")
-        flag.StringVar(&hostname, "hostname", "localhost", "server hostname")
+        var addr, configPath string
+        flag.StringVar(&addr, "listen", "", "listening address")
+        flag.StringVar(&configPath, "config", "", "path to configuration file")
         flag.Parse()
 
-        ln, err := net.Listen("tcp", addr)
-        if err != nil {
-                log.Fatalf("failed to start listener: %v", err)
+        var cfg *config.Server
+        if configPath != "" {
+                var err error
+                cfg, err = config.Load(configPath)
+                if err != nil {
+                        log.Fatalf("failed to load config file: %v", err)
+                }
+        } else {
+                cfg = config.Defaults()
+        }
+
+        if addr != "" {
+                cfg.Addr = addr
+        }
+
+        var ln net.Listener
+        if cfg.TLS != nil {
+                cert, err := tls.LoadX509KeyPair(cfg.TLS.CertPath, cfg.TLS.KeyPath)
+                if err != nil {
+                        log.Fatalf("failed to load TLS certificate and key: %v", err)
+                }
+
+                tlsCfg := &tls.Config{Certificates: []tls.Certificate{cert}}
+                ln, err = tls.Listen("tcp", cfg.Addr, tlsCfg)
+                if err != nil {
+                        log.Fatalf("failed to start TLS listener: %v", err)
+                }
+        } else {
+                var err error
+                ln, err = net.Listen("tcp", addr)
+                if err != nil {
+                        log.Fatalf("failed to start listener: %v", err)
+                }
         }
 
         srv := jounce.NewServer()
         // TODO: load from config/DB
-        srv.Hostname = hostname
+        srv.Hostname = cfg.Hostname
         srv.Upstreams = []jounce.Upstream{{
                 Addr:     "chat.freenode.net:6697",
@@ -31 +63 @@
         }}
 
-        log.Printf("server listening on %v", addr)
+        log.Printf("server listening on %q", cfg.Addr)
         go srv.Run()
         log.Fatal(srv.Serve(ln))