diff --git a/README.md b/README.md index 53125ce..2f718eb 100644 --- a/README.md +++ b/README.md @@ -301,12 +301,12 @@ other settings in `.molly` files will be ignored: * `DirectoryTitles` * `GeminiExt` * `MimeOverrides` +* `PermRedirects` +* `TempRedirects` Future support is planned for `.molly` files to be able to override: * `CertificateZones` -* `TempRedirects` -* `PermRedirects` ## Trivia diff --git a/handler.go b/handler.go index 37979d2..24e460a 100644 --- a/handler.go +++ b/handler.go @@ -81,7 +81,6 @@ func handleGeminiRequest(conn net.Conn, config Config, accessLogEntries chan Log if config.ReadMollyFiles { parseMollyFiles(path, &config, errorLogEntries) } - // Check for redirects for src, dst := range config.TempRedirects { if URL.Path == src { @@ -304,8 +303,14 @@ func parseMollyFiles(path string, config *Config, errorLogEntries chan string) { config.DirectorySort = mollyFile.DirectorySort config.DirectoryReverse = mollyFile.DirectoryReverse config.DirectoryTitles = mollyFile.DirectoryTitles - for pathRegex, newType := range mollyFile.MimeOverrides { - config.MimeOverrides[pathRegex] = newType + for key, value := range mollyFile.TempRedirects { + config.TempRedirects[key] = value + } + for key, value := range mollyFile.PermRedirects { + config.PermRedirects[key] = value + } + for key, value := range mollyFile.MimeOverrides { + config.MimeOverrides[key] = value } } }