Commit 3ed19af9 authored by Nico Alt's avatar Nico Alt

Fix mess with RSS/Atom feeds

So !258 and
!259 even would
have made things worse, thank you @eighthave for stopping me.

Before de73acf8 one feed was served at /feed.xml and the other one
at /feed (note it's a file, not a directory).
Instead of messing around with Apache to let it serve /feed/index.xml at
/feed/, I decided to just go with /feed.xml and sleep well.

So this change does the following:
* Remove any jekyll_redirects from feed.xml
* Serve Atom feed at /feed.xml
* Redirect from /feed to /feed.xml
* Set /feed.xml in all proper places
parent c3c4f988
......@@ -242,7 +242,7 @@ RewriteRule ^repository/browse.*$ /packages/ [L,R=301]
RewriteCond %{REQUEST_URI} !^/archive
RewriteCond %{REQUEST_URI} !^/assets
RewriteCond %{REQUEST_URI} !^/css
RewriteCond %{REQUEST_URI} !^/feed
RewriteCond %{REQUEST_URI} !^/feed.xml
RewriteCond %{REQUEST_URI} !^/repo
RewriteCond %{REQUEST_URI} !^/wiki
RewriteCond %{REQUEST_URI} !^/wp-content
......@@ -315,6 +315,7 @@ RedirectPermanent /news-and-reviews /news
RedirectPermanent /translate /docs/Translation_and_Localization
RedirectPermanent /repository/issues /issues
RedirectPermanent /repository /packages
RedirectPermanent /feed /feed.xml
RedirectPermanent /manual/html_node/Build.html /docs/Building_Applications/
RedirectPermanent /manual/html_node/Building-Applications.html /docs/Building_Applications/
......
......@@ -31,8 +31,6 @@ GEM
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-feed (0.9.3)
jekyll (~> 3.3)
jekyll-include-cache (0.1.0)
jekyll (~> 3.3)
jekyll-paginate-v2 (1.7.3)
......@@ -80,11 +78,9 @@ DEPENDENCIES
git
jekyll
jekyll-fdroid!
jekyll-feed
jekyll-paginate-v2 (<= 1.7.3)
jekyll-polyglot
jekyll-redirect-from
loofah
BUNDLED WITH
1.15.1
1.16.2
......@@ -47,7 +47,7 @@ exclude_from_localization:
- archive
- assets
- css
- feed
- feed.xml
- repo
- tools
- wiki
......
......@@ -8,7 +8,7 @@
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed/" | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
<link rel="apple-touch-icon" sizes="180x180" href="{{ "/assets/apple-touch-icon.png?v=8j6PKzW9Mk" | prepend: site.baseurl }}"/>
<link rel="icon" type="image/png" sizes="32x32" href="{{ "/assets/favicon-32x32.png?v=8j6PKzW9Mk" | prepend: site.baseurl }}"/>
......
---
layout: null
permalink: /feed/
redirect_from:
- /feed.xml
permalink: /feed.xml
---
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title>{{ site.title | xml_escape }}</title>
<subtitle>{{ site.description | xml_escape }}</subtitle>
<link href="{{ "/feed/" | prepend: site.baseurl | prepend: site.url }}" rel="self" />
<link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" />
<link href="{{ site.url }}{{ site.baseurl }}/" />
<id>{{ site.url }}{{ site.baseurl }}/</id>
<updated>{{ site.time | date_to_xmlschema }}</updated>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment