Add a tlskey and tlscert configuration option

Author: 42wim

main.go

@@ -126,8 +126,18 @@ func main() {
 }
 
 func tlsbind() net.Listener {
+	certPath := v.GetString("tlsdir") + "/cert.pem"
+	keyPath := v.GetString("tlsdir") + "/key.pem"
 
-	kpr, err := NewKeypairReloader(v.GetString("tlsdir")+"/cert.pem", v.GetString("tlsdir")+"/key.pem")
+	if v.GetString("tlscert") != "" {
+		certPath = v.GetString("tlscert")
+	}
+
+	if v.GetString("tlskey") != "" {
+		keyPath = v.GetString("tlskey")
+	}
+
+	kpr, err := NewKeypairReloader(certPath, keyPath)
 	if err != nil {
 		logger.Errorf("could not load TLS, incorrect directory? Error: %s", err)
 		os.Exit(1)

matterircd.toml.example

@@ -18,7 +18,11 @@ gops = false
 
 #directory to look for key.pem and cert.pem. (default ".")
 #
-#TLSDir = "/etc/pki/tls/matermost/"
+#TLSDir = "/etc/pki/tls/matterircd/"
+
+# Specify the full path for your key and cert
+#TLSKey = "/etc/pki/tls/matterircd/key.pem"
+#TLSCert = "/etc/pki/tls/matterircd/cer.pem"
 
 #PasteBufferTimeout specifies the amount of time in milliseconds that
 #messages get kept in matterircd internal buffer before being sent to

tlsutil.go

@@ -16,6 +16,7 @@ type keypairReloader struct {
 	keyPath  string
 }
 
+// nolint:golint
 func NewKeypairReloader(certPath, keyPath string) (*keypairReloader, error) {
 	result := &keypairReloader{
 		certPath: certPath,