all repos — website @ e4a9203bc0af96c29b40b53d32b20aefb6940e35

My website

make hostname-based redirection configurable

Alan Pearce
commit

e4a9203bc0af96c29b40b53d32b20aefb6940e35

parent

6b5a99d1de4420a9334ed9b2119b56b138518c1c

1 file changed, 10 insertions(+), 7 deletions(-)

changed files
M internal/server/server.go → internal/server/server.go
@@ -29,6 +29,7 @@
 type Config struct {
 	Development   bool   `conf:"default:false,flag:dev"`
 	Root          string `conf:"default:website"`
+	Redirect      bool   `conf:"default:false"`
 	ListenAddress string `conf:"default:localhost"`
 	Port          string `conf:"default:3000,short:p"`
 	TLS           bool   `conf:"default:false"`

@@ -132,14 +133,16 @@ if err != nil {
 		return nil, errors.Wrap(err, "could not create website mux")
 	}
 	log.Debug("binding main handler to", "host", listenAddress)
-	hostname := config.BaseURL.Hostname()
 
-	loggingMux.Handle(hostname+"/", mux)
-
-	loggingMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		newURL := config.BaseURL.JoinPath(r.URL.String())
-		http.Redirect(w, r, newURL.String(), 301)
-	})
+	if runtimeConfig.Development || runtimeConfig.Redirect {
+		loggingMux.Handle(config.BaseURL.Hostname()+"/", mux)
+		loggingMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+			newURL := config.BaseURL.JoinPath(r.URL.String())
+			http.Redirect(w, r, newURL.String(), 301)
+		})
+	} else {
+		loggingMux.Handle("/", mux)
+	}
 
 	top.Handle("/",
 		serverHeaderHandler(