From 7efb04b5d7b5c5363a8a0d95fce5513cd125ede9 Mon Sep 17 00:00:00 2001 From: tjpcc Date: Tue, 10 Oct 2023 09:39:14 -0600 Subject: improved gemini{servertls} support --- gemini.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gemini.go b/gemini.go index 3af28a9..3fb7a46 100644 --- a/gemini.go +++ b/gemini.go @@ -2,6 +2,7 @@ package main import ( "context" + "crypto/tls" "errors" "fmt" "strings" @@ -57,7 +58,14 @@ func buildGeminiServers(servers []Server, config *Configuration) ([]sr.Server, e } } - if configs[0].TLS == nil { + var tlsConfig *tls.Config + for _, config := range configs { + if config.TLS != nil { + tlsConfig = config.TLS + break + } + } + if tlsConfig == nil { return nil, errors.New("gemini server must have a servertls directive") } @@ -68,7 +76,7 @@ func buildGeminiServers(servers []Server, config *Configuration) ([]sr.Server, e addr, logging.LogRequests(info)(handler), errlog, - configs[0].TLS, + tlsConfig, ) if err != nil { return nil, err -- cgit v1.2.3