From 85e6538f2f610ad66bf0be0eff5bdcf05f1b8e3c Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 14 Aug 2014 23:08:41 +0400 Subject: [PATCH] Combine TLS cert and key options in single one --- README | 4 ++-- goircd.go | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README b/README index faae872..f2b3317 100644 --- a/README +++ b/README @@ -56,8 +56,8 @@ Just execute goircd daemon. It has following optional arguments: * -statedir: directory where all channels states will be saved and loaded during startup. If omitted, then states will be lost after daemon termination -* -tlsbind/-tlskey/-tlscert: enable TLS, specify address to listen on, - certificate and key files +* -tlsbind/-pem: enable TLS, specify address to listen on and path + to PEM file with certificate and private key * -passwords: enable client authentication and specify path to passwords file * -verbose: increase log messages verbosity 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)