From 604739c5f54e05cdf3eaa658c75dd64e7867e987 Mon Sep 17 00:00:00 2001
From: Christian Nunciato <c@nunciato.org>
Date: Fri, 14 Jun 2019 10:22:38 -0700
Subject: [PATCH 1/2] Add RSS for the blog

Signed-off-by: Christian Nunciato <c@nunciato.org>
---
 config.toml                | 16 +++++++++++-----
 layouts/blog/rss.xml       | 29 +++++++++++++++++++++++++++++
 layouts/partials/head.html | 36 +++++++++++++++++++-----------------
 3 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 layouts/blog/rss.xml

diff --git a/config.toml b/config.toml
index 746a8cc34c85..013e403a497c 100644
--- a/config.toml
+++ b/config.toml
@@ -2,7 +2,13 @@ baseURL = "https://pulumi.io/"
 languageCode = "en-us"
 title = "Pulumi"
 
-disableKinds = ["category", "RSS"]
+disableKinds = ["category", "taxonomyTerm"]
+sectionPagesMenu = "main"
+pygmentsCodeFences = true
+pygmentsUseClasses = true
+
+[outputFormats.RSS]
+    baseName = "rss"
 
 pygmentsCodeFences = true
 pygmentsUseClasses = true
@@ -10,12 +16,12 @@ pygmentsUseClasses = true
 sectionPagesMenu = "main"
 
 [taxonomies]
-  author = "authors"
-  tag    = "tags"
+    author = "authors"
+    tag = "tags"
 
 [permalinks]
-  authors = "/blog/author/:slug/"
-  tags    = "/blog/tag/:slug/"
+    authors = "/blog/author/:slug/"
+    tags = "/blog/tag/:slug/"
 
 [blackfriday]
     fractions = false
diff --git a/layouts/blog/rss.xml b/layouts/blog/rss.xml
new file mode 100644
index 000000000000..66acbe4b8701
--- /dev/null
+++ b/layouts/blog/rss.xml
@@ -0,0 +1,29 @@
+<rss version="2.0">
+    <channel>
+        <title>Pulumi Blog</title>
+        <link>{{ .Permalink }}</link>
+        <description>Infrastructure as Code for AWS, Azure, Google Cloud, including Kubernetes, Serverless, Containers, for Developers and DevOps.</description>
+        <language>{{ .Site.LanguageCode }}</language>
+        <pubDate>{{ .Date.Format "Mon, 02 Jan 2006" | safeHTML }}</pubDate>
+        {{ range where .Data.Pages "Type" "in" "blog" }}
+            <item>
+                <title>{{ .Title }}</title>
+                <link>{{ .Permalink }}</link>
+                <pubDate>{{ .Date.Format "Mon, 02 Jan 2006" | safeHTML }}</pubDate>
+                <guid>{{ .Permalink }}</guid>
+                <description>{{ .Summary | html }}</description>
+                {{ range $id := .Params.authors }}
+                    {{ $author := index $.Site.Data.team.team $id }}
+                    {{ if $author }}
+                        <author>{{ $author.name }}</author>
+                    {{ end }}
+                {{ end }}
+                {{ range $tag := .Params.tags }}
+                    {{ if $tag }}
+                        <category>{{ $tag }}</category>
+                    {{ end }}
+                {{ end }}
+            </item>
+        {{ end }}
+    </channel>
+</rss>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index adec9bb6a49d..b97827c2eba9 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -3,8 +3,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     <meta name="google-site-verification" content="j-Opn93zR4YQcV5bbYN99BmNc48BT5mzd2VpzKaW9YY" />
+
     {{ if isset .Params "redirect_to" }}
-    <meta http-equiv="refresh" content="0; url={{ .Params.redirect_to }}" />
+        <meta http-equiv="refresh" content="0; url={{ .Params.redirect_to }}" />
     {{ end }}
 
     <!--
@@ -13,7 +14,6 @@
     <meta property="og:type" content="article">
     <meta property="og:url" content="{{ .Permalink }}">
     <meta property="og:site_name" content="pulumi">
-
     <meta name="twitter:card" content="summary">
     <meta name="twitter:site" content="@PulumiCorp">
 
@@ -21,12 +21,12 @@
         <meta name="twitter:creator" content="{{ .Params.meta_twitter_creator }}">
     {{ else if isset .Params "authors" }}
         {{ range $idx, $authorName := .Param "authors" }}
-        {{ $authorData := index $.Site.Data.team.team $authorName }}
-        {{ with $authorData.social }}
-        {{ with .twitter }}
-        <meta name="twitter:creator" content="@{{ . }}">
-        {{ end }}
-        {{ end }}
+            {{ $authorData := index $.Site.Data.team.team $authorName }}
+            {{ with $authorData.social }}
+                {{ with .twitter }}
+                    <meta name="twitter:creator" content="@{{ . }}">
+                {{ end }}
+            {{ end }}
         {{ end }}
     {{ end }}
 
@@ -58,13 +58,15 @@
             <meta property="og:image" content="{{ .Site.BaseURL }}{{ .Params.meta_image }}">
         {{ end }}
     {{ else }}
-    <meta property="og:image" content="{{ .Site.BaseURL }}/social/pulumi.png">
+        <meta property="og:image" content="{{ .Site.BaseURL }}/social/pulumi.png">
     {{ end }}
 
     <title>{{ .Title }}{{if not .IsHome}} - {{ end }}{{ .Site.Title }}</title>
-
     <link rel="icon" type="image/x-icon" href="/images/favicon.ico" />
 
+    <!-- RSS link for the blog. -->
+    <link rel="alternate" type="application/rss+xml" href="{{ .Site.BaseURL }}blog/rss.xml" title="Pulumi Blog" />
+
     <!--
         Build Sass. Generated file will contain content hash in filename,
         so no need to add query param to cache bust.
@@ -78,16 +80,16 @@
     <script> !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t,e){var n=document.createElement("script");n.type="text/javascript";n.async=!0;n.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var o=document.getElementsByTagName("script")[0];o.parentNode.insertBefore(n,o);analytics._loadOptions=e};analytics.SNIPPET_VERSION="4.1.0"; analytics.load("mNROzbfcr6gi80tV37QuBcL0tK1DWvte"); analytics.page(); }}();</script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/anchor-js/4.1.0/anchor.min.js"></script>
     <script>
-    document.addEventListener("DOMContentLoaded", function(event) {
-        anchors.add("h1:not(.no-anchor), h2:not(.no-anchor), h3:not(.no-anchor), h4:not(.no-anchor), h5:not(.no-anchor), h6:not(.no-anchor)");
-    });
+        document.addEventListener("DOMContentLoaded", function(event) {
+            anchors.add("h1:not(.no-anchor), h2:not(.no-anchor), h3:not(.no-anchor), h4:not(.no-anchor), h5:not(.no-anchor), h6:not(.no-anchor)");
+        });
     </script>
 
     {{/* Tests to enforce required frontmatter for certain content types. */}}
     {{ if eq .Type "blog" }}
-    {{ if not (isset .Params "authors") }}{{ errorf "Blog posts require authors: %s" .File.Path }}{{ end }}
-    {{ if not (or (isset .Params "description") (isset .Params "summary")) }}
-        {{ errorf "Blog posts require a description: %s" .File.Path }}
-    {{ end }}
+        {{ if not (isset .Params "authors") }}{{ errorf "Blog posts require authors: %s" .File.Path }}{{ end }}
+            {{ if not (or (isset .Params "description") (isset .Params "summary")) }}
+                {{ errorf "Blog posts require a description: %s" .File.Path }}
+            {{ end }}
     {{ end }}
 </head>

From 0aa6ffcb06a1f3cf8ecf8b2a3eafaa2409fb5164 Mon Sep 17 00:00:00 2001
From: Christian Nunciato <c@nunciato.org>
Date: Mon, 17 Jun 2019 13:57:46 -0700
Subject: [PATCH 2/2] Address feedback

Signed-off-by: Christian Nunciato <c@nunciato.org>
---
 config.toml          | 5 -----
 layouts/blog/rss.xml | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/config.toml b/config.toml
index 013e403a497c..fa179a3f1fa1 100644
--- a/config.toml
+++ b/config.toml
@@ -10,11 +10,6 @@ pygmentsUseClasses = true
 [outputFormats.RSS]
     baseName = "rss"
 
-pygmentsCodeFences = true
-pygmentsUseClasses = true
-
-sectionPagesMenu = "main"
-
 [taxonomies]
     author = "authors"
     tag = "tags"
diff --git a/layouts/blog/rss.xml b/layouts/blog/rss.xml
index 66acbe4b8701..e9759f3364b0 100644
--- a/layouts/blog/rss.xml
+++ b/layouts/blog/rss.xml
@@ -1,15 +1,16 @@
+{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" | safeHTML }}
 <rss version="2.0">
     <channel>
         <title>Pulumi Blog</title>
         <link>{{ .Permalink }}</link>
         <description>Infrastructure as Code for AWS, Azure, Google Cloud, including Kubernetes, Serverless, Containers, for Developers and DevOps.</description>
         <language>{{ .Site.LanguageCode }}</language>
-        <pubDate>{{ .Date.Format "Mon, 02 Jan 2006" | safeHTML }}</pubDate>
+        <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
         {{ range where .Data.Pages "Type" "in" "blog" }}
             <item>
                 <title>{{ .Title }}</title>
                 <link>{{ .Permalink }}</link>
-                <pubDate>{{ .Date.Format "Mon, 02 Jan 2006" | safeHTML }}</pubDate>
+                <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
                 <guid>{{ .Permalink }}</guid>
                 <description>{{ .Summary | html }}</description>
                 {{ range $id := .Params.authors }}