diff options
| author | Steve <nilslice@gmail.com> | 2016-10-21 22:29:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-21 22:29:42 -0700 |
| commit | 737a3f796b87c0ee8236ef949fff81e2238fc071 (patch) | |
| tree | 79cec6e00e6acbfca5fd5d7c78619fc26d94554c /system/admin | |
| parent | 519c5b44d0b36e1f61cb0228889401fa1e33357e (diff) | |
| parent | 936b8aef13b164ce74f9ec11bf1385275d282df8 (diff) | |
Merge pull request #7 from bosssauce/ponzu-dev
[core] Adding support for automatic TLS / SSL via Let's Encrypt
Diffstat (limited to 'system/admin')
| -rw-r--r-- | system/admin/config/config.go | 8 | ||||
| -rw-r--r-- | system/admin/handlers.go | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/system/admin/config/config.go b/system/admin/config/config.go index c83c311..66f767d 100644 --- a/system/admin/config/config.go +++ b/system/admin/config/config.go @@ -12,6 +12,7 @@ type Config struct { Name string `json:"name"` Domain string `json:"domain"` + AdminEmail string `json:"admin_email"` ClientSecret string `json:"client_secret"` Etag string `json:"etag"` CacheInvalidate []string `json:"-"` @@ -48,8 +49,13 @@ func (c *Config) MarshalEditor() ([]byte, error) { }), }, editor.Field{ + View: editor.Input("AdminEmail", c, map[string]string{ + "label": "Adminstrator Email (will be notified of internal system information)", + }), + }, + editor.Field{ View: editor.Input("ClientSecret", c, map[string]string{ - "label": "Client Secret (used to validate requests)", + "label": "Client Secret (used to validate requests, DO NOT SHARE)", "disabled": "true", }), }, diff --git a/system/admin/handlers.go b/system/admin/handlers.go index de340ae..497dec6 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -66,18 +66,20 @@ func initHandler(res http.ResponseWriter, req *http.Request) { etag := db.NewEtag() req.Form.Set("etag", etag) - err = db.SetConfig(req.Form) + email := strings.ToLower(req.FormValue("email")) + password := req.FormValue("password") + usr := user.NewUser(email, password) + + _, err = db.SetUser(usr) if err != nil { fmt.Println(err) res.WriteHeader(http.StatusInternalServerError) return } - email := strings.ToLower(req.FormValue("email")) - password := req.FormValue("password") - usr := user.NewUser(email, password) - - _, err = db.SetUser(usr) + // set initial user email as admin_email and make config + req.Form.Set("admin_email", email) + err = db.SetConfig(req.Form) if err != nil { fmt.Println(err) res.WriteHeader(http.StatusInternalServerError) |