From 4713599071d0bd8b392cce3fdf1406d7e1267e48 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 11 2020 19:28:57 +0000
Subject: Merge branch 'hellcp/jekyll-rewrite-feed' into 'production'


Add a rewrite rule to redirect to the correct feed url

See merge request infra/salt!352
---

diff --git a/pillar/role/web_jekyll.sls b/pillar/role/web_jekyll.sls
index f60b880..fbadd1f 100644
--- a/pillar/role/web_jekyll.sls
+++ b/pillar/role/web_jekyll.sls
@@ -15,7 +15,7 @@ nginx:
                 - image/x-icon: 90d
                 - ~application/: 28d
                 - ~font/: 28d
-                - ~text/: 28d
+                - ~text/: 1d
                 - ~image/: 28d
             - server:
                 - server_name: {{ website }}.opensuse.org
@@ -40,8 +40,26 @@ nginx:
                     - index:
                         - index.html
                         - index.htm
+                    - try_files:
+                        - $uri
+                        - $uri/index.html
+                        - $uri.html
+                {% if website == 'news' %}
+                - if ($args ~* "feed=rss2"):
+                    - set: $args ""
+                    - rewrite: ^.*$ /feed.xml redirect
+                - rewrite: ^/feed/$ /feed.xml redirect
+                - rewrite: ^.*/feed/$ /feed.xml redirect
+                - rewrite: ^/feed$ /feed.xml redirect
+                {% endif %}
+                {% if website == 'planet' %}
+                - rewrite: ^/global/$ / redirect
+                {% endif %}
                 - location ~* \.(?:ttf|otf|eot|woff)$:
                     - add_header: Access-Control-Allow-Origin "*"
+                - location ~* \.(?:xml)$:
+                    - add_header: Access-Control-Allow-Origin "*"
+                    - charset: utf-8
                 - error_page: 405 = $uri
                 - error_page: 405 =200 $uri
                 - error_page: 500 502 503 504 /50x.html