an
/
ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pem and key file path are now configurable

This commit is contained in:
Andreas Neue 2016-08-09 16:52:43 +02:00
parent bae871a524
commit 5e43ee5d38
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server.go
View File

@ -117,9 +117,18 @@ func (sv *Server) Run() {
if err == nil { if err == nil {
go sv.listen(laddr) go sv.listen(laddr)
} }
tls := true
pem, err := sv.config.GetString("tls", "pem")
if err != nil {
tls = false
}
key, err := sv.config.GetString("tls", "key")
if err != nil {
tls = false
}
laddr, err = sv.config.GetString("net", "listen_tls") laddr, err = sv.config.GetString("net", "listen_tls")
if err == nil { if err == nil && tls {
go sv.listenTls(laddr) go sv.listenTls(laddr, pem, key)
} }
for { for {
err = sv.dispatcher() err = sv.dispatcher()
@ -159,8 +168,8 @@ func (sv *Server) listen(laddr string) {
} }
} }
func (sv *Server) listenTls(laddr string) { func (sv *Server) listenTls(laddr, pem, key string) {
cert, err := tls.LoadX509KeyPair("cert/server.pem", "cert/server.key") cert, err := tls.LoadX509KeyPair(pem, key)
if err != nil { if err != nil {
xlog.Fatal(err.Error()) xlog.Fatal(err.Error())
} }