diff options
| -rw-r--r-- | config.go | 4 | ||||
| -rw-r--r-- | config/debug.json | 10 | ||||
| -rw-r--r-- | config/default.json | 10 | ||||
| -rw-r--r-- | handler.go | 2 | ||||
| -rw-r--r-- | server.go | 2 | ||||
| -rw-r--r-- | templates.go | 2 |
6 files changed, 11 insertions, 19 deletions
@@ -11,10 +11,6 @@ import ( type RuntimeConfig struct { Path string - Http HttpConfig `json:"http"` -} - -type HttpConfig struct { Host string `json:"bind_host"` Port string `json:"bind_port"` Static string `json:"static"` diff --git a/config/debug.json b/config/debug.json index 8333e1e..47e80ea 100644 --- a/config/debug.json +++ b/config/debug.json @@ -1,8 +1,6 @@ { - "http":{ - "bind_host":"127.0.0.1", - "bind_port":"8080", - "static":"./data/static", - "templates":"./data/templates" - } + "bind_host":"127.0.0.1", + "bind_port":"8080", + "static":"./data/static", + "templates":"./data/templates" } diff --git a/config/default.json b/config/default.json index 0fbcf09..02220d3 100644 --- a/config/default.json +++ b/config/default.json @@ -1,8 +1,6 @@ { - "http":{ - "bind_host":"127.0.0.1", - "bind_port":"8080", - "static":"/usr/share/ceres/static", - "templates":"/usr/share/ceres/templates" - } + "bind_host":"127.0.0.1", + "bind_port":"8080", + "static":"/usr/share/ceres/static", + "templates":"/usr/share/ceres/templates" } @@ -209,6 +209,6 @@ func addRecipesGet(w http.ResponseWriter, r *http.Request) { func staticGet(w http.ResponseWriter, r *http.Request, filename string) { - path := filepath.Join(config.Http.Static, filename) + path := filepath.Join(config.Static, filename) http.ServeFile(w, r, path) } @@ -19,7 +19,7 @@ func setupRoutes() { func runServer() { setupRoutes() - address := config.Http.Host + ":" + config.Http.Port + address := config.Host + ":" + config.Port log.Println("Serving content at 'http://" + address + "'.") log.Fatal(http.ListenAndServe(address, nil)) } diff --git a/templates.go b/templates.go index 6b4fe51..2c3e79c 100644 --- a/templates.go +++ b/templates.go @@ -8,7 +8,7 @@ import ( ) func setupTemplates() *template.Template { - t, err := template.ParseGlob(config.Http.Templates + "/*.html") + t, err := template.ParseGlob(config.Templates + "/*.html") if err != nil { panic(err) } |