feat(template): update base urls for feeds

sparanoid · Oct 31, 2015 · 3c13efe · 3c13efe
1 parent 64ee055
commit 3c13efe
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/_app/_includes/_amsf.html b/_app/_includes/_amsf.html
@@ -61,7 +61,7 @@
 {% comment %}
   Feed URL
 {% endcomment %}
-{% capture amsf_feed_url %}{{ site.feed | prepend: site.base }}{% endcapture %}
+{% capture amsf_feed_url %}{{ site.feed | prepend: site.base | replace: '/index.xml', '/' }}{% endcapture %}
 
 {% comment %}
   Page title
@@ -71,7 +71,7 @@
 {% comment %}
   Page URL
 {% endcomment %}
-{% capture amsf_page_url %}{{ page.url | prepend: amsf_site_base }}{% endcapture %}
+{% capture amsf_page_url %}{{ page.url | prepend: amsf_site_base | replace: '/index.html', '/' | replace: '/index.htm', '/' | replace: '/index.xml', '/' }}{% endcapture %}
 
 {% comment %}
   Page type (used by Open Graph)

diff --git a/_app/feed-atom.xml b/_app/feed-atom.xml
@@ -10,11 +10,11 @@ permalink: /feed.xml
   <title>{{ site.name }}</title>
   <subtitle>{{ site.description }}</subtitle>
   <updated>{{ site.time | date_to_xmlschema }}</updated>
-  <id>{{ site.feed | prepend: amsf_site_base | xml_escape }}</id>
+  <id>{{ amsf_site_base | xml_escape }}/</id>
   <rights>Copyright © {{ site.time | date: "%Y" }}, {{ site.data.authors.default.name }}</rights>
 
   <link rel="alternate" type="text/html" hreflang="en" href="{{ amsf_site_base }}/" />
-  <link rel="self" type="application/atom+xml" href="{{ site.feed | prepend: amsf_site_base }}" />
+  <link rel="self" type="application/atom+xml" href="{{ amsf_page_url }}" />
 
   <author>
     <name>{{ site.data.authors.default.name }}</name>

diff --git a/_app/sitemap.xml b/_app/sitemap.xml
@@ -14,7 +14,7 @@
   {% for page in site.html_pages %}
     {% if page.hidden != true %}
       <url>
-        <loc>{{ page.url | replace:'/index.html', '/' | prepend: amsf_site_base }}</loc>
+        <loc>{{ page.url | prepend: amsf_site_base | replace: '/index.html', '/' }}</loc>
         {% if page.last_modified_at %}
           <lastmod>{{ page.last_modified_at | date: "%F" }}</lastmod>
         {% endif %}

diff --git a/_config.init.yml b/_config.init.yml
@@ -82,7 +82,7 @@ base:           null
 # Default:      /assets
 assets:         /assets
 
-# Define feed path. If you use `/feed/index.xml` as feed permalink, `{{ page.url }}` won't pass feed validation with "Self reference doesn't match document location" error
+# Define your main feed URL, this will be only used in your templates
 # Default:      /feed.xml
 feed:           /feed.xml
 

diff --git a/_config.yml b/_config.yml
@@ -82,7 +82,7 @@ base:           /lab/amsf
 # Default:      /assets
 assets:         /assets
 
-# Define feed path. If you use `/feed/index.xml` as feed permalink, `{{ page.url }}` won't pass feed validation with "Self reference doesn't match document location" error
+# Define your main feed URL, this will be only used in your templates
 # Default:      /feed.xml
 feed:           /feed.xml