Ability to remove hosts from the states, refactoring

[tofuproxy.git] / cmd / tofuproxy / main.go

diff --git a/cmd/tofuproxy/main.go b/cmd/tofuproxy/main.go
index 5ad6e62674c9b1eceddd417558937036cb5a1302..96dbd321a209503e527b839e2acb97cbc3d61bcd 100644 (file)
--- a/cmd/tofuproxy/main.go
+++ b/cmd/tofuproxy/main.go
@@ -32,7 +32,8 @@ func main() {
        crtPath := flag.String("cert", "cert.pem", "Path to server X.509 certificate")
        prvPath := flag.String("key", "prv.pem", "Path to server PKCS#8 private key")
        bind := flag.String("bind", "[::1]:8080", "Bind address")
-       certs := flag.String("certs", "certs", "Directory with pinned certificates")
+       certs := flag.String("certs", "./certs", "Directory with pinned certificates")
+       ccerts := flag.String("ccerts", "./ccerts", "Directory with client certificates")
        dnsSrv := flag.String("dns", "[::1]:53", "DNS server")
        fifosDir := flag.String("fifos", "fifos", "Directory with FIFOs")
        notai := flag.Bool("notai", false, "Do not prepend TAI64N to logs")
@@ -50,9 +51,9 @@ func main() {
        }
 
        fifos.NoTAI = *notai
-       fifos.FIFOs = *fifosDir
-       fifos.Init()
+       fifos.Start(*fifosDir)
        tofuproxy.Certs = *certs
+       tofuproxy.CCerts = *ccerts
        tofuproxy.DNSSrv = *dnsSrv
        tofuproxy.CACert = caCert
        tofuproxy.CAPrv = caPrv
@@ -65,7 +66,7 @@ func main() {
                Handler:      &tofuproxy.Handler{},
                TLSNextProto: tofuproxy.TLSNextProtoS,
        }
-       log.Println("listening:", *bind, "certs:", *certs)
+       log.Println("listening:", *bind, "dns:", *dnsSrv, "certs:", *certs, "ccerts:", *ccerts)
        if err := srv.Serve(ln); err != nil {
                log.Fatalln(err)
        }