X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=goircd.go;h=b0f5e07716db40625c08378d046670c9154c68d8;hp=a0633ad9065aa1a3f310734d07ae7693f458488b;hb=85e6538f2f610ad66bf0be0eff5bdcf05f1b8e3c;hpb=b35f6e7b3c510bea24c0927073720a459055816e diff --git a/goircd.go b/goircd.go index a0633ad..b0f5e07 100644 --- a/goircd.go +++ b/goircd.go @@ -41,8 +41,7 @@ var ( passwords = flag.String("passwords", "", "Optional path to passwords file") tlsBind = flag.String("tlsbind", "", "TLS address to bind to") - tlsKey = flag.String("tlskey", "", "TLS keyfile") - tlsCert = flag.String("tlscert", "", "TLS certificate") + tlsPEM = flag.String("tlspem", "", "Path to TLS certificat+key PEM file") verbose = flag.Bool("v", false, "Enable verbose logging.") ) @@ -138,9 +137,9 @@ func Run() { go listenerLoop(listener, events) } if *tlsBind != "" { - cert, err := tls.LoadX509KeyPair(*tlsCert, *tlsKey) + cert, err := tls.LoadX509KeyPair(*tlsPEM, *tlsPEM) if err != nil { - log.Fatalf("Could not load TLS keys from %s and %s: %s", *tlsCert, *tlsKey, err) + log.Fatalf("Could not load TLS keys from %s: %s", *tlsPEM, err) } config := tls.Config{Certificates: []tls.Certificate{cert}} listenerTLS, err := tls.Listen("tcp", *tlsBind, &config)