Move the privacy config into a parent

See #4751

diff --git a/hugolib/config.go b/hugolib/config.go
index cc808597c48f099d420d583acdcc14693f028a1a..b9cfd92d6ec19f699cf6e8d563383ef94b98b669 100644 (file)
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -22,11 +22,19 @@ import (
        "strings"
 
        "github.com/gohugoio/hugo/config"
+       "github.com/gohugoio/hugo/config/privacy"
        "github.com/gohugoio/hugo/helpers"
        "github.com/spf13/afero"
        "github.com/spf13/viper"
 )
 
+// SiteConfig represents the config in .Site.Config.
+type SiteConfig struct {
+       // This contains all privacy related settings that can be used to
+       // make the YouTube template etc. GDPR compliant.
+       Privacy privacy.Config
+}
+
 // ConfigSourceDescriptor describes where to find the config (e.g. config.toml etc.).
 type ConfigSourceDescriptor struct {
        Fs afero.Fs

diff --git a/hugolib/config_test.go b/hugolib/config_test.go
index f6306dec172f89f80d9851676b77d5f02519d7e6..aec67336944ddd026f6f5dd77813eac0a5274d1c 100644 (file)
--- a/hugolib/config_test.go
+++ b/hugolib/config_test.go
@@ -384,6 +384,6 @@ privacyEnhanced = true
        b.WithConfigFile("toml", tomlConfig)
        b.Build(BuildCfg{SkipRender: true})
 
-       assert.True(b.H.Sites[0].Info.PrivacyConfig.YouTube.PrivacyEnhanced)
+       assert.True(b.H.Sites[0].Info.Config.Privacy.YouTube.PrivacyEnhanced)
 
 }

diff --git a/hugolib/site.go b/hugolib/site.go
index 0ee0db4a7187f6220ea28300518ea65a9633bd2e..b6ba636d45d671ab8ff872c0fc04bd5d7c1e1671 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -388,11 +388,7 @@ type SiteInfo struct {
        preserveTaxonomyNames bool
        Data                  *map[string]interface{}
 
-       // This contains all privacy related settings that can be used to
-       // make the YouTube template etc.GDPR compliant.
-       // It is mostly in use by Hugo's built-in, but is also available
-       // for end users with {{ .Site.PrivacyConfig.YouTube.NoCookie }} etc.
-       PrivacyConfig privacy.Config
+       Config SiteConfig
 
        owner                          *HugoSites
        s                              *Site
@@ -1151,7 +1147,7 @@ func (s *Site) initializeSiteInfo() error {
                Data:                           &s.Data,
                owner:                          s.owner,
                s:                              s,
-               PrivacyConfig:                  privacyConfig,
+               Config:                         SiteConfig{Privacy: privacyConfig},
        }
 
        rssOutputFormat, found := s.outputFormats[KindHome].GetByName(output.RSSFormat.Name)

diff --git a/tpl/tplimpl/embedded/templates.autogen.go b/tpl/tplimpl/embedded/templates.autogen.go
index ff65fe6a83bfbc933fdf858bed40f2d3cf73ace7..bd33e77b5f832ad06d79324144e79f5d94eea7f6 100644 (file)
--- a/tpl/tplimpl/embedded/templates.autogen.go
+++ b/tpl/tplimpl/embedded/templates.autogen.go
@@ -76,7 +76,7 @@ var EmbeddedTemplates = [][2]string{
        {{ end }}
 </sitemapindex>
 `},
-       {`disqus.html`, `{{- $pc := .Page.Site.PrivacyConfig.Disqus -}}
+       {`disqus.html`, `{{- $pc := .Page.Site.Config.Privacy.Disqus -}}
 {{- if not $pc.Disable -}}
 {{ if .Site.DisqusShortname }}<div id="disqus_thread"></div>
 <script>
@@ -296,21 +296,21 @@ M66.52,7.74c-0.78-2.93-2.49-5.41-5.42-6.19C55.79,.13,34,0,34,0S12.21,.13,6.9,1.5
 <!-- image -->`},
        {`shortcodes/gist.html`, `<script src="//gist.github.com/{{ index .Params 0 }}/{{ index .Params 1 }}.js{{if len .Params | eq 3 }}?file={{ index .Params 2 }}{{end}}"></script>`},
        {`shortcodes/highlight.html`, `{{ if len .Params | eq 2 }}{{ highlight (trim .Inner "\n\r") (.Get 0) (.Get 1) }}{{ else }}{{ highlight (trim .Inner "\n\r") (.Get 0) "" }}{{ end }}`},
-       {`shortcodes/instagram.html`, `{{- $pc := .Page.Site.PrivacyConfig.Instagram -}}
+       {`shortcodes/instagram.html`, `{{- $pc := .Page.Site.Config.Privacy.Instagram -}}
 {{- if not $pc.Disable -}}
 {{ if len .Params | eq 2 }}{{ if eq (.Get 1) "hidecaption" }}{{ with getJSON "https://api.instagram.com/oembed/?url=https://instagram.com/p/" (index .Params 0) "/&hidecaption=1" }}{{ .html | safeHTML }}{{ end }}{{ end }}{{ else }}{{ with getJSON "https://api.instagram.com/oembed/?url=https://instagram.com/p/" (index .Params 0) "/&hidecaption=0" }}{{ .html | safeHTML }}{{ end }}{{ end }}
 {{- end -}}`},
        {`shortcodes/ref.html`, `{{ if len .Params | eq 2 }}{{ ref .Page (.Get 0) (.Get 1) }}{{ else }}{{ ref .Page (.Get 0) }}{{ end }}`},
        {`shortcodes/relref.html`, `{{ if len .Params | eq 2 }}{{ relref .Page (.Get 0) (.Get 1) }}{{ else }}{{ relref .Page (.Get 0) }}{{ end }}`},
-       {`shortcodes/speakerdeck.html`, `{{- $pc := .Page.Site.PrivacyConfig.SpeakerDeck -}}
+       {`shortcodes/speakerdeck.html`, `{{- $pc := .Page.Site.Config.Privacy.SpeakerDeck -}}
 {{- if not $pc.Disable -}}
 <script async class='speakerdeck-embed' data-id='{{ index .Params 0 }}' data-ratio='1.33333333333333' src='//speakerdeck.com/assets/embed.js'></script>
 {{- end -}}`},
-       {`shortcodes/tweet.html`, `{{- $pc := .Page.Site.PrivacyConfig.Tweet -}}
+       {`shortcodes/tweet.html`, `{{- $pc := .Page.Site.Config.Privacy.Tweet -}}
 {{- if not $pc.Disable -}}
 {{ (getJSON "https://api.twitter.com/1/statuses/oembed.json?id=" (index .Params 0)).html | safeHTML }}
 {{- end -}}`},
-       {`shortcodes/vimeo.html`, `{{- $pc := .Page.Site.PrivacyConfig.Vimeo -}}
+       {`shortcodes/vimeo.html`, `{{- $pc := .Page.Site.Config.Privacy.Vimeo -}}
 {{- if not $pc.Disable -}}
 {{ if .IsNamedParams }}<div {{ if .Get "class" }}class="{{ .Get "class" }}"{{ else }}style="position: relative; padding-bottom: 56.25%; padding-top: 30px; height: 0; overflow: hidden;"{{ end }}>
   <iframe src="//player.vimeo.com/video/{{ .Get "id" }}" {{ if not (.Get "class") }}style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;" {{ end }}webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
@@ -320,7 +320,7 @@ M66.52,7.74c-0.78-2.93-2.49-5.41-5.42-6.19C55.79,.13,34,0,34,0S12.21,.13,6.9,1.5
  </div>
 {{ end }}
 {{- end -}}`},
-       {`shortcodes/youtube.html`, `{{- $pc := .Page.Site.PrivacyConfig.YouTube -}}
+       {`shortcodes/youtube.html`, `{{- $pc := .Page.Site.Config.Privacy.YouTube -}}
 {{- if not $pc.Disable -}}
 {{- $ytHost := cond $pc.PrivacyEnhanced  "www.youtube-nocookie.com" "www.youtube.com" -}}
 {{- if $pc.Simple -}}

diff --git a/tpl/tplimpl/embedded/templates/disqus.html b/tpl/tplimpl/embedded/templates/disqus.html
index 3f44369a7206c95f617fbfd684f381d078891e7e..aebcd14472b3076fe0424b58f333fba9b9b627ad 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/disqus.html
+++ b/tpl/tplimpl/embedded/templates/disqus.html
@@ -1,4 +1,4 @@
-{{- $pc := .Page.Site.PrivacyConfig.Disqus -}}
+{{- $pc := .Page.Site.Config.Privacy.Disqus -}}
 {{- if not $pc.Disable -}}
 {{ if .Site.DisqusShortname }}<div id="disqus_thread"></div>
 <script>

diff --git a/tpl/tplimpl/embedded/templates/shortcodes/instagram.html b/tpl/tplimpl/embedded/templates/shortcodes/instagram.html
index 471dcc77d73028b84857136c7327b4cf70224e2c..ba6c5e601d8a8a83104fcd228e3f51370003a3d5 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/shortcodes/instagram.html
+++ b/tpl/tplimpl/embedded/templates/shortcodes/instagram.html
@@ -1,4 +1,4 @@
-{{- $pc := .Page.Site.PrivacyConfig.Instagram -}}
+{{- $pc := .Page.Site.Config.Privacy.Instagram -}}
 {{- if not $pc.Disable -}}
 {{ if len .Params | eq 2 }}{{ if eq (.Get 1) "hidecaption" }}{{ with getJSON "https://api.instagram.com/oembed/?url=https://instagram.com/p/" (index .Params 0) "/&hidecaption=1" }}{{ .html | safeHTML }}{{ end }}{{ end }}{{ else }}{{ with getJSON "https://api.instagram.com/oembed/?url=https://instagram.com/p/" (index .Params 0) "/&hidecaption=0" }}{{ .html | safeHTML }}{{ end }}{{ end }}
 {{- end -}}
\ No newline at end of file

diff --git a/tpl/tplimpl/embedded/templates/shortcodes/speakerdeck.html b/tpl/tplimpl/embedded/templates/shortcodes/speakerdeck.html
index 5045f347860537e7c44f451b3d57111fbff76fe2..5a3ca2620e457f29a93745569ee253f8f555a86c 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/shortcodes/speakerdeck.html
+++ b/tpl/tplimpl/embedded/templates/shortcodes/speakerdeck.html
@@ -1,4 +1,4 @@
-{{- $pc := .Page.Site.PrivacyConfig.SpeakerDeck -}}
+{{- $pc := .Page.Site.Config.Privacy.SpeakerDeck -}}
 {{- if not $pc.Disable -}}
 <script async class='speakerdeck-embed' data-id='{{ index .Params 0 }}' data-ratio='1.33333333333333' src='//speakerdeck.com/assets/embed.js'></script>
 {{- end -}}
\ No newline at end of file

diff --git a/tpl/tplimpl/embedded/templates/shortcodes/tweet.html b/tpl/tplimpl/embedded/templates/shortcodes/tweet.html
index ef2dd07a13f17b958bed602346b3c72c084eaf8a..09adaf7e9b464a055dd59b71c0eaa8876b4d17a8 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/shortcodes/tweet.html
+++ b/tpl/tplimpl/embedded/templates/shortcodes/tweet.html
@@ -1,4 +1,4 @@
-{{- $pc := .Page.Site.PrivacyConfig.Tweet -}}
+{{- $pc := .Page.Site.Config.Privacy.Tweet -}}
 {{- if not $pc.Disable -}}
 {{ (getJSON "https://api.twitter.com/1/statuses/oembed.json?id=" (index .Params 0)).html | safeHTML }}
 {{- end -}}
\ No newline at end of file

diff --git a/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html b/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html
index bd021376de29d4f7cca4714ab6313cffc08a3bc8..77dceed3da5ef512394e6529b5c0e42dbd3ca3ef 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html
+++ b/tpl/tplimpl/embedded/templates/shortcodes/vimeo.html
@@ -1,4 +1,4 @@
-{{- $pc := .Page.Site.PrivacyConfig.Vimeo -}}
+{{- $pc := .Page.Site.Config.Privacy.Vimeo -}}
 {{- if not $pc.Disable -}}
 {{ if .IsNamedParams }}<div {{ if .Get "class" }}class="{{ .Get "class" }}"{{ else }}style="position: relative; padding-bottom: 56.25%; padding-top: 30px; height: 0; overflow: hidden;"{{ end }}>
   <iframe src="//player.vimeo.com/video/{{ .Get "id" }}" {{ if not (.Get "class") }}style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;" {{ end }}webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>

diff --git a/tpl/tplimpl/embedded/templates/shortcodes/youtube.html b/tpl/tplimpl/embedded/templates/shortcodes/youtube.html
index b0da600a3357690c633aa2dbcfda383a3c649495..bbb3fdd07b2573c565f74f63c9c78fe74d33bbb8 100755 (executable)
--- a/tpl/tplimpl/embedded/templates/shortcodes/youtube.html
+++ b/tpl/tplimpl/embedded/templates/shortcodes/youtube.html
@@ -1,4 +1,4 @@
-{{- $pc := .Page.Site.PrivacyConfig.YouTube -}}
+{{- $pc := .Page.Site.Config.Privacy.YouTube -}}
 {{- if not $pc.Disable -}}
 {{- $ytHost := cond $pc.PrivacyEnhanced  "www.youtube-nocookie.com" "www.youtube.com" -}}
 {{- if $pc.Simple -}}