From d3368be9215ac262f5ecb7e3580c824d15c1208b Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Mon, 15 May 2023 11:03:39 +0200 Subject: [PATCH] Migreren van config.toml-configuratiebestand naar config-directory --- config.toml | 122 ----------------------------- config/_default/hugo.toml | 11 +++ config/_default/markup.toml | 20 +++++ config/_default/menus.toml | 49 ++++++++++++ config/_default/outputformats.toml | 22 ++++++ config/_default/outputs.toml | 9 +++ config/_default/params.toml | 13 +++ config/_default/permalinks.toml | 6 ++ config/_default/security.toml | 16 ++++ config/_default/social.toml | 5 ++ config/_default/taxonomies.toml | 5 ++ config/disabled/hugo.toml | 11 +++ config/disabled/markup.toml | 21 +++++ config/disabled/menu.toml | 36 +++++++++ config/disabled/outputs.toml | 29 +++++++ config/disabled/params.toml | 13 +++ config/disabled/permalinks.toml | 6 ++ config/disabled/security.toml | 17 ++++ config/disabled/social.toml | 6 ++ config/disabled/taxonomies.toml | 6 ++ 20 files changed, 301 insertions(+), 122 deletions(-) delete mode 100644 config.toml create mode 100644 config/_default/hugo.toml create mode 100644 config/_default/markup.toml create mode 100644 config/_default/menus.toml create mode 100644 config/_default/outputformats.toml create mode 100644 config/_default/outputs.toml create mode 100644 config/_default/params.toml create mode 100644 config/_default/permalinks.toml create mode 100644 config/_default/security.toml create mode 100644 config/_default/social.toml create mode 100644 config/_default/taxonomies.toml create mode 100644 config/disabled/hugo.toml create mode 100644 config/disabled/markup.toml create mode 100644 config/disabled/menu.toml create mode 100644 config/disabled/outputs.toml create mode 100644 config/disabled/params.toml create mode 100644 config/disabled/permalinks.toml create mode 100644 config/disabled/security.toml create mode 100644 config/disabled/social.toml create mode 100644 config/disabled/taxonomies.toml diff --git a/config.toml b/config.toml deleted file mode 100644 index d42b6e6..0000000 --- a/config.toml +++ /dev/null @@ -1,122 +0,0 @@ -# Configuratie voor de website - -baseURL = "https://www3.nluug.nl/" -languageCode = "nl" -defaultContentLanguage = "nl" -title = "NLUUG" -theme = "nluug" -enableGitInfo = true -disableHugoGeneratorInject = true - -[markup] - [markup.goldmark.renderer] - unsafe = true - [markup.highlight] - anchorLineNos = false - codeFences = true - guessSyntax = false - hl_Lines = '' - hl_inline = false - lineAnchors = '' - lineNoStart = 1 - lineNos = false - lineNumbersInTable = true - noClasses = true - noHl = false - style = 'monokailight' - tabWidth = 4 - -[menu] - [[menu.main]] - identifier = "organisatie" - name = "Organisatie" - url = "/organisatie/" - weight = 10 - [[menu.main]] - identifier = "evenementen" - name = "Evenementen" - url = "/evenementen/" - weight = 20 - [[menu.main]] - identifier = "evenementen-kalender" - name = "Kalender" - url = "/evenementen/kalender/" - parent = "evenementen" - weight = 21 - [[menu.main]] - identifier = "lidmaatschap" - name = "Lidmaatschap" - url = "/lidmaatschap/" - weight = 30 - [[menu.main]] - identifier = "nieuws" - name = "Nieuws" - url = "/nieuws/" - weight = 40 - [[menu.main]] - identifier = "contact" - name = "Contact" - url = "/contact/" - weight = 50 - -[outputs] - home = ["HTML", "RSS", "JSON"] - section = ["HTML"] - page = ["HTML", "CalendarEvent"] - -[outputFormats.RSS] - mediatype = "application/rss" - baseName = "atom" - -[outputFormats.JSON] - mediatype = "application/json" - baseName = "feed" - -[outputFormats.CalendarEvent] - mediaType = "text/calendar" - baseName = "calendar" - -#[outputFormats.XMLEvent] -# mediaType = "application/xml" -# baseName = "schedule" - -[params] - description = "NLUUG website met de doelstellingen, laatste nieuws en evenementen van onze vereniging." - # Fallback-auteur voor posts die geen echte auteur hebben - author = "NLUUG" - # Datum-formaat en tijdzone, de gebruikte waardes in datum en tijd zijn van belang - dateFormat = "02-01-2006" - timeZone = "Europe/Amsterdam" - # Grafisch - logo = "/assets/favicon.ico" - -[permalinks] - pages = "/:slug" - -[security] - enableInlineShortcodes = false - - [security.exec] - allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$', '^rst2html$'] - osEnv = ['(?i)^((HTTPS?|NO)_PROXY|PATH(EXT)?|APPDATA|TE?MP|TERM|GO\w+|GIT_EXEC_PATH|LD_LIBRARY_PATH|npm_config_(cache|init_module|userconfig)|pandoc_datadir|PYTHONHOME|RUBYLIB|SNAP)$'] - - [security.funcs] - getenv = ['^HUGO_', '^CI$'] - - [security.http] - methods = ['(?i)GET|POST'] - urls = ['.*'] - -[social] - twitter = "NLUUG" - -[taxonomies] - tag = "tags" - - - - - -#ignoreErrors = ["error-remote-getjson"] - -# EOF diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml new file mode 100644 index 0000000..ab9b4d5 --- /dev/null +++ b/config/_default/hugo.toml @@ -0,0 +1,11 @@ +# Basisconfiguratie voor de website + +baseURL = "https://www3.nluug.nl/" +languageCode = "nl" +defaultContentLanguage = "nl" +title = "NLUUG" +theme = "nluug" +enableGitInfo = true +disableHugoGeneratorInject = true + +# EOF diff --git a/config/_default/markup.toml b/config/_default/markup.toml new file mode 100644 index 0000000..a85aca2 --- /dev/null +++ b/config/_default/markup.toml @@ -0,0 +1,20 @@ +# Configuratie voor highlighting snippets e.d. + +[markup.goldmark.renderer] + unsafe = true +[markup.highlight] + anchorLineNos = false + codeFences = true + guessSyntax = false + hl_Lines = '' + hl_inline = false + lineAnchors = '' + lineNoStart = 1 + lineNos = false + lineNumbersInTable = true + noClasses = true + noHl = false + style = 'monokailight' + tabWidth = 4 + +# EOF diff --git a/config/_default/menus.toml b/config/_default/menus.toml new file mode 100644 index 0000000..cf33ac2 --- /dev/null +++ b/config/_default/menus.toml @@ -0,0 +1,49 @@ +# Menu-configuratie + + [[main]] + identifier = "organisatie" + name = "Organisatie" + url = "/organisatie/" + weight = 10 + + [[main]] + identifier = "evenementen" + name = "Evenementen" + url = "/evenementen/" + weight = 20 + + [[main]] + identifier = "evenementen-kalender" + name = "Kalender" + url = "/evenementen/kalender/" + parent = "evenementen" + weight = 21 + + [[main]] + identifier = "lidmaatschap" + name = "Lidmaatschap" + url = "/lidmaatschap/" + weight = 30 + + [[main]] + identifier = "nieuws" + name = "Nieuws" + url = "/nieuws/" + weight = 40 + + [[main]] + identifier = "contact" + name = "Contact" + url = "/contact/" + weight = 50 + +[[footer]] + name = 'Terms' + pageRef = '/terms' + weight = 10 +[[footer]] + name = 'Privacy' + pageRef = '/privacy' + weight = 20 + +# EOF diff --git a/config/_default/outputformats.toml b/config/_default/outputformats.toml new file mode 100644 index 0000000..5391822 --- /dev/null +++ b/config/_default/outputformats.toml @@ -0,0 +1,22 @@ +# Configuratie tbv exporteerde formaten + +# RSS-feed (Atom) +[RSS] + mediatype = "application/rss" + baseName = "atom" + +# JSON Feed, index.json +[JSON] + mediatype = "application/json" + baseName = "feed" + +# CalendarEvent genereerd een iCal-bestand voor evenementen +[CalendarEvent] + mediaType = "text/calendar" + baseName = "calendar" + +#[outputFormats.XMLEvent] +# mediaType = "application/xml" +# baseName = "schedule" + +# EOF diff --git a/config/_default/outputs.toml b/config/_default/outputs.toml new file mode 100644 index 0000000..39df575 --- /dev/null +++ b/config/_default/outputs.toml @@ -0,0 +1,9 @@ +# Configuratie tbv exporteerde formaten + +# Voor de home-page maken we een HTML, RSS en JSON Feed +# Secties alleen in HTML en voor pagina's in zowel HTML als CalendarEvent (iCAL) waar het van toepassing is +home = ["HTML", "RSS", "JSON"] +section = ["HTML"] +page = ["HTML", "CalendarEvent"] + +# EOF diff --git a/config/_default/params.toml b/config/_default/params.toml new file mode 100644 index 0000000..817f565 --- /dev/null +++ b/config/_default/params.toml @@ -0,0 +1,13 @@ +# Aanvullende velden die we binnen de website gebruiken + +[params] + description = "NLUUG website met de doelstellingen, laatste nieuws en evenementen van onze vereniging." + # Fallback-auteur voor posts die geen echte auteur hebben + author = "NLUUG" + # Datum-formaat en tijdzone, de gebruikte waardes in datum en tijd zijn van belang + dateFormat = "02-01-2006" + timeZone = "Europe/Amsterdam" + # Grafisch + logo = "/assets/favicon.ico" + +# EOF diff --git a/config/_default/permalinks.toml b/config/_default/permalinks.toml new file mode 100644 index 0000000..ae6629f --- /dev/null +++ b/config/_default/permalinks.toml @@ -0,0 +1,6 @@ +# Configuratie voor URL-opbouw + +#[permalinks] +pages = "/:slug" + +# EOF diff --git a/config/_default/security.toml b/config/_default/security.toml new file mode 100644 index 0000000..f1f7ae7 --- /dev/null +++ b/config/_default/security.toml @@ -0,0 +1,16 @@ +# Configuratie tbv extra beveiliging en toegestane functies tijdens render en testen + +enableInlineShortcodes = false + +[exec] + allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$', '^rst2html$'] + osEnv = ['(?i)^((HTTPS?|NO)_PROXY|PATH(EXT)?|APPDATA|TE?MP|TERM|GO\w+|GIT_EXEC_PATH|LD_LIBRARY_PATH|npm_config_(cache|init_module|userconfig)|pandoc_datadir|PYTHONHOME|RUBYLIB|SNAP)$'] + +[funcs] + getenv = ['^HUGO_', '^CI$'] + +[http] + methods = ['(?i)GET|POST'] + urls = ['.*'] + +# EOF diff --git a/config/_default/social.toml b/config/_default/social.toml new file mode 100644 index 0000000..5b02d37 --- /dev/null +++ b/config/_default/social.toml @@ -0,0 +1,5 @@ +# Configuratie voor de gebruikte social media binnen de website + +twitter = "NLUUG" + +# EOF diff --git a/config/_default/taxonomies.toml b/config/_default/taxonomies.toml new file mode 100644 index 0000000..1cece08 --- /dev/null +++ b/config/_default/taxonomies.toml @@ -0,0 +1,5 @@ +# Configuratie voor het aanmaken van category-/tags-pagina's + +tag = "tags" + +# EOF diff --git a/config/disabled/hugo.toml b/config/disabled/hugo.toml new file mode 100644 index 0000000..ab9b4d5 --- /dev/null +++ b/config/disabled/hugo.toml @@ -0,0 +1,11 @@ +# Basisconfiguratie voor de website + +baseURL = "https://www3.nluug.nl/" +languageCode = "nl" +defaultContentLanguage = "nl" +title = "NLUUG" +theme = "nluug" +enableGitInfo = true +disableHugoGeneratorInject = true + +# EOF diff --git a/config/disabled/markup.toml b/config/disabled/markup.toml new file mode 100644 index 0000000..160eceb --- /dev/null +++ b/config/disabled/markup.toml @@ -0,0 +1,21 @@ +# Configuratie voor highlighting snippets e.d. + +[markup] + [markup.goldmark.renderer] + unsafe = true + [markup.highlight] + anchorLineNos = false + codeFences = true + guessSyntax = false + hl_Lines = '' + hl_inline = false + lineAnchors = '' + lineNoStart = 1 + lineNos = false + lineNumbersInTable = true + noClasses = true + noHl = false + style = 'monokailight' + tabWidth = 4 + +# EOF diff --git a/config/disabled/menu.toml b/config/disabled/menu.toml new file mode 100644 index 0000000..c0fd1b1 --- /dev/null +++ b/config/disabled/menu.toml @@ -0,0 +1,36 @@ +# Menu-configuratie + +[menu] + [[menu.main]] + identifier = "organisatie" + name = "Organisatie" + url = "/organisatie/" + weight = 10 + [[menu.main]] + identifier = "evenementen" + name = "Evenementen" + url = "/evenementen/" + weight = 20 + [[menu.main]] + identifier = "evenementen-kalender" + name = "Kalender" + url = "/evenementen/kalender/" + parent = "evenementen" + weight = 21 + [[menu.main]] + identifier = "lidmaatschap" + name = "Lidmaatschap" + url = "/lidmaatschap/" + weight = 30 + [[menu.main]] + identifier = "nieuws" + name = "Nieuws" + url = "/nieuws/" + weight = 40 + [[menu.main]] + identifier = "contact" + name = "Contact" + url = "/contact/" + weight = 50 + +# EOF diff --git a/config/disabled/outputs.toml b/config/disabled/outputs.toml new file mode 100644 index 0000000..8b7dc03 --- /dev/null +++ b/config/disabled/outputs.toml @@ -0,0 +1,29 @@ +# Configuratie tbv exporteerde formaten + +# Voor de home-page maken we een HTML, RSS en JSON Feed +# Secties alleen in HTML en voor pagina's in zowel HTML als CalendarEvent (iCAL) waar het van toepassing is +[outputs] + home = ["HTML", "RSS", "JSON"] + section = ["HTML"] + page = ["HTML", "CalendarEvent"] + +# RSS-feed (Atom) +[outputFormats.RSS] + mediatype = "application/rss" + baseName = "atom" + +# JSON Feed, index.json +[outputFormats.JSON] + mediatype = "application/json" + baseName = "feed" + +# CalendarEvent genereerd een iCal-bestand voor evenementen +[outputFormats.CalendarEvent] + mediaType = "text/calendar" + baseName = "calendar" + +#[outputFormats.XMLEvent] +# mediaType = "application/xml" +# baseName = "schedule" + +# EOF diff --git a/config/disabled/params.toml b/config/disabled/params.toml new file mode 100644 index 0000000..817f565 --- /dev/null +++ b/config/disabled/params.toml @@ -0,0 +1,13 @@ +# Aanvullende velden die we binnen de website gebruiken + +[params] + description = "NLUUG website met de doelstellingen, laatste nieuws en evenementen van onze vereniging." + # Fallback-auteur voor posts die geen echte auteur hebben + author = "NLUUG" + # Datum-formaat en tijdzone, de gebruikte waardes in datum en tijd zijn van belang + dateFormat = "02-01-2006" + timeZone = "Europe/Amsterdam" + # Grafisch + logo = "/assets/favicon.ico" + +# EOF diff --git a/config/disabled/permalinks.toml b/config/disabled/permalinks.toml new file mode 100644 index 0000000..892651f --- /dev/null +++ b/config/disabled/permalinks.toml @@ -0,0 +1,6 @@ +# Configuratie voor URL-opbouw + +[permalinks] + pages = "/:slug" + +# EOF diff --git a/config/disabled/security.toml b/config/disabled/security.toml new file mode 100644 index 0000000..a074984 --- /dev/null +++ b/config/disabled/security.toml @@ -0,0 +1,17 @@ +# Configuratie tbv extra beveiliging en toegestane functies tijdens render en testen + +[security] + enableInlineShortcodes = false + + [security.exec] + allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$', '^rst2html$'] + osEnv = ['(?i)^((HTTPS?|NO)_PROXY|PATH(EXT)?|APPDATA|TE?MP|TERM|GO\w+|GIT_EXEC_PATH|LD_LIBRARY_PATH|npm_config_(cache|init_module|userconfig)|pandoc_datadir|PYTHONHOME|RUBYLIB|SNAP)$'] + + [security.funcs] + getenv = ['^HUGO_', '^CI$'] + + [security.http] + methods = ['(?i)GET|POST'] + urls = ['.*'] + +# EOF diff --git a/config/disabled/social.toml b/config/disabled/social.toml new file mode 100644 index 0000000..86f7260 --- /dev/null +++ b/config/disabled/social.toml @@ -0,0 +1,6 @@ +# Configuratie voor de gebruikte social media binnen de website + +[social] + twitter = "NLUUG" + +# EOF diff --git a/config/disabled/taxonomies.toml b/config/disabled/taxonomies.toml new file mode 100644 index 0000000..4bec38f --- /dev/null +++ b/config/disabled/taxonomies.toml @@ -0,0 +1,6 @@ +# Configuratie voor het aanmaken van category-/tags-pagina's + +[taxonomies] + tag = "tags" + +# EOF