move website.Options to main file
2 files changed, 15 insertions(+), 16 deletions(-)
M internal/website/mux.go → internal/website/mux.go
@@ -7,27 +7,11 @@ "regexp" "slices" "strings" - "go.alanpearce.eu/homestead/internal/config" ihttp "go.alanpearce.eu/homestead/internal/http" "go.alanpearce.eu/homestead/internal/server" "github.com/kevinpollet/nego" - "github.com/osdevisnot/sorvor/pkg/livereload" ) - -type Options struct { - Source string `conf:"default:../website"` - DBPath string `conf:"default:site.db"` - Redirect bool `conf:"default:true"` - Development bool `conf:"default:false,flag:dev"` - BaseURL config.URL `conf:"default:localhost"` - VCS struct { - Branch string `conf:"default:main"` - RemoteURL config.URL `conf:"default:https://git.alanpearce.eu/website"` - } - - LiveReload *livereload.LiveReload `conf:"-"` -} func (website *Website) webfinger(w http.ResponseWriter, r *http.Request) *ihttp.Error { if r.URL.Query().Get("resource") == website.acctResource {
M internal/website/website.go → internal/website/website.go
@@ -19,7 +19,22 @@ "go.alanpearce.eu/homestead/templates" "go.alanpearce.eu/x/log" "github.com/benpate/digit" + "github.com/osdevisnot/sorvor/pkg/livereload" ) + +type Options struct { + Source string `conf:"default:../website"` + DBPath string `conf:"default:site.db"` + Redirect bool `conf:"default:true"` + Development bool `conf:"default:false,flag:dev"` + BaseURL config.URL `conf:"default:localhost"` + VCS struct { + Branch string `conf:"default:main"` + RemoteURL config.URL `conf:"default:https://git.alanpearce.eu/website"` + } + + LiveReload *livereload.LiveReload `conf:"-"` +} type Website struct { config *config.Config