From fd31094cb68104a3eee8840e2a502485967fd318 Mon Sep 17 00:00:00 2001 From: Solderpunk Date: Tue, 30 Jun 2020 20:39:26 +0200 Subject: [PATCH] Allow .molly files to set certificate zones. --- README.md | 5 +---- config.go | 1 + handler.go | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 77b47a0..bb5222f 100644 --- a/README.md +++ b/README.md @@ -296,6 +296,7 @@ E.g. when handling a request which maps to Only the following settings can be overriden by `.molly` files. Any other settings in `.molly` files will be ignored: +* `CertificateZones` * `DefaultLang` * `DirectorySort` * `DirectoryReverse` @@ -305,10 +306,6 @@ other settings in `.molly` files will be ignored: * `PermRedirects` * `TempRedirects` -Future support is planned for `.molly` files to be able to override: - -* `CertificateZones` - ## Trivia Margaret Brown was an American philanthropist and socialite who diff --git a/config.go b/config.go index 3e3ca32..686ea6c 100644 --- a/config.go +++ b/config.go @@ -33,6 +33,7 @@ type MollyFile struct { TempRedirects map[string]string PermRedirects map[string]string MimeOverrides map[string]string + CertificateZones map[string][]string DefaultLang string DirectorySort string DirectoryReverse bool diff --git a/handler.go b/handler.go index 24e460a..8da94fb 100644 --- a/handler.go +++ b/handler.go @@ -312,6 +312,9 @@ func parseMollyFiles(path string, config *Config, errorLogEntries chan string) { for key, value := range mollyFile.MimeOverrides { config.MimeOverrides[key] = value } + for key, value := range mollyFile.CertificateZones { + config.CertificateZones[key] = value + } } }