feat: update hugo.toml to align with the latest hugo config

tomowang · Nov 21, 2023 · d6c1635 · d6c1635
1 parent 3e0da99
commit d6c1635
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 12 deletions.
diff --git a/exampleSite/hugo.toml b/exampleSite/hugo.toml
@@ -11,9 +11,6 @@ enableInlineShortcodes = true
 ignoreErrors = ["error-remote-getjson"]
 theme = "hugo-theme-tailwind"
 
-# GA Tracking ID
-googleAnalytics = "G-75W5D7R0V1"
-
 [markup]
   _merge = "deep"
 
@@ -118,9 +115,18 @@ series = "series"
     privacyEnhanced = true
 
 [services]
+  # GA Tracking ID
+  [services.googleAnalytics]
+    ID = "G-75W5D7R0V1"
 
   [services.instagram]
     disableInlineCSS = true
 
   [services.twitter]
     disableInlineCSS = true
+
+  # comments
+  [services.disqus]
+    # https://gohugo.io/templates/internal/#disqus
+    # disqusShortname = "your-disqus-shortname"
+    shortname = ''
diff --git a/hugo.toml b/hugo.toml
@@ -3,14 +3,6 @@ languageCode = 'en-us'
 title = 'My New Hugo Site'
 hasCJKLanguage = true
 
-# GA Tracking ID
-googleAnalytics = ""
-
-# comments
-# https://gohugo.io/templates/internal/#disqus
-# disqusShortname = "your-disqus-shortname"
-disqusShortname = ""
-
 [markup.goldmark]
   [markup.goldmark.renderer]
     unsafe = true
@@ -90,6 +82,42 @@ disqusShortname = ""
     icon = 'brand-github'
     link = 'https://github.com/tomowang'
 
+[privacy]
+
+  [privacy.vimeo]
+    disabled = false
+    simple = true
+
+  [privacy.twitter]
+    disabled = false
+    enableDNT = true
+    simple = true
+
+  [privacy.instagram]
+    disabled = false
+    simple = true
+
+  [privacy.youtube]
+    disabled = false
+    privacyEnhanced = true
+
+[services]
+  # GA Tracking ID
+  [services.googleAnalytics]
+    ID = ""
+
+  [services.instagram]
+    disableInlineCSS = true
+
+  [services.twitter]
+    disableInlineCSS = true
+
+  # comments
+  [services.disqus]
+    # https://gohugo.io/templates/internal/#disqus
+    # disqusShortname = "your-disqus-shortname"
+    shortname = ''
+
 [module]
   [module.hugoVersion]
     extended = false

diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html
@@ -6,7 +6,7 @@
 
 or whatever comment engine you want -> https://gohugo.io/content-management/comments/#readout -->
 
-{{ if .Site.DisqusShortname }}
+{{ if .Site.Config.Services.Disqus.Shortname }}
   {{ template "_internal/disqus.html" . }}
 {{ else if .Site.Params.giscus.enabled }}
   {{ with .Site.Params.giscus }}