Switch webserver to global config struct

1 files changed, 11 insertions, 11 deletions

diff --git a/server.go b/server.go
index ef7397d..f7f67f4 100644
--- a/server.go
+++ b/server.go
@@ -6,21 +6,21 @@ import (
 	"net/http"
 )
 
-func setupRoutes(config HttpConfig, db *Database) {
+func setupRoutes(db *Database) {
 
-	http.HandleFunc("/", indexMux(db, config.Templates))
-	http.HandleFunc("/recipe", recipeMux(db, config.Templates))
-	http.HandleFunc("/recipe/edit", recipeEditMux(db, config.Templates))
-	http.HandleFunc("/recipe/image", recipeImageMux(config.Storage))
-	http.HandleFunc("/add_recipes", addRecipesMux(db, config.Storage, config.Static))
-	http.HandleFunc("/static/style.css", staticStyleMux("style.css", config.Static))
-	http.HandleFunc("/favicon.ico", faviconMux("favicon.ico", config.Static))
+	http.HandleFunc("/", indexMux(db))
+	http.HandleFunc("/recipe", recipeMux(db))
+	http.HandleFunc("/recipe/edit", recipeEditMux(db))
+	http.HandleFunc("/recipe/image", recipeImageMux())
+	http.HandleFunc("/add_recipes", addRecipesMux(db))
+	http.HandleFunc("/static/style.css", staticStyleMux())
+	http.HandleFunc("/favicon.ico", faviconMux())
 }
 
-func runServer(config HttpConfig, db *Database) {
+func runServer(db *Database) {
 
-	setupRoutes(config, db)
-	address := config.Host + ":" + config.Port
+	setupRoutes(db)
+	address := config.Http.Host + ":" + config.Http.Port
 	log.Println("Binding to 'http://" + address)
 	log.Fatal(http.ListenAndServe(address, nil))
 }