tweak configuration schema
4 files changed, 20 insertions(+), 22 deletions(-)
M internal/builder/builder.go → internal/builder/builder.go
@@ -70,9 +70,9 @@ storage := options.Storage postDir := "post" siteSettings := templates.SiteSettings{ Title: config.Title, - DefaultLanguage: config.DefaultLanguage, + Language: config.Language, Menu: config.Menus["main"], - InjectLiveReload: config.InjectLiveReload, + InjectLiveReload: options.Development, } log.Debug("reading posts", "source", options.Source)@@ -255,7 +255,6 @@ func BuildSite(options *Options, cfg *config.Config, log *log.Logger) errors.E { if cfg == nil { return errors.New("config is nil") } - cfg.InjectLiveReload = options.Development return build(options, cfg, log) }
M internal/config/config.go → internal/config/config.go
@@ -32,21 +32,20 @@ return errors.WithMessagef(err, "could not parse URL %s", string(text)) } type Config struct { - DefaultLanguage string `toml:"default_language"` - BaseURL URL `toml:"base_url"` - InjectLiveReload bool - Title string - Email string - Description string - DomainStartDate string `toml:"domain_start_date"` - OriginalDomain string `toml:"original_domain"` - GoatCounter URL `toml:"goatcounter"` - Domains []string - WildcardDomain string `toml:"wildcard_domain"` - OIDCHost URL `toml:"oidc_host"` - Taxonomies []Taxonomy - CSP *CSP `toml:"content-security-policy"` - Extra struct { + Language string `toml:"language"` + BaseURL URL `toml:"base_url"` + Title string + Email string + Description string + DomainStartDate string `toml:"domain_start_date"` + OriginalDomain string `toml:"original_domain"` + GoatCounter URL `toml:"goatcounter"` + Domains []string + WildcardDomain string `toml:"wildcard_domain"` + OIDCHost URL `toml:"oidc_host"` + Taxonomies []Taxonomy + CSP *CSP `toml:"content-security-policy"` + Extra struct { Headers map[string]string } Menus map[string][]MenuItem
M internal/website/website.go → internal/website/website.go
@@ -104,9 +104,9 @@ } website.config = cfg website.siteSettings = &templates.SiteSettings{ Title: cfg.Title, - DefaultLanguage: cfg.DefaultLanguage, + Language: cfg.Language, Menu: cfg.Menus["main"], - InjectLiveReload: false, + InjectLiveReload: opts.Development, } if opts.Development {
M templates/layout.templ → templates/layout.templ
@@ -9,7 +9,7 @@ ) type SiteSettings struct { Title string - DefaultLanguage string + Language string Menu []config.MenuItem InjectLiveReload bool }@@ -40,7 +40,7 @@ } templ Layout(site SiteSettings, page PageSettings) { <!DOCTYPE html> - <html lang={ site.DefaultLanguage }> + <html lang={ site.Language }> <head> <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>