From 9d266d3b1bb38591bd772bff0c8b755eb915a4d0 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Nov 04 2022 19:56:38 +0000
Subject: Merge branch 'hellcp/planet-rewrite' into 'production'


Rewrite the old urls on the planet

See merge request infra/salt!584
---

diff --git a/pillar/role/web_jekyll.sls b/pillar/role/web_jekyll.sls
index 058bfd5..dcda655 100644
--- a/pillar/role/web_jekyll.sls
+++ b/pillar/role/web_jekyll.sls
@@ -48,6 +48,7 @@ nginx:
                         - $uri
                         - $uri/index.html
                         - $uri.html
+                        - =404
                 {% if website == 'news' %}
                 - if ($args ~* "feed=rss2"):
                     - set: $args ""
@@ -58,6 +59,10 @@ nginx:
                 {% endif %}
                 {% if website == 'planet' %}
                 - rewrite: ^/global/$ / redirect
+                - location ~ /tw(|/.*)$:
+                    - rewrite: ^/tw(.*)$ /zh_TW$1 redirect
+                - location ~ /gr(|/.*)$:
+                    - rewrite: ^/gr(.*)$ /el$1 redirect
                 {% endif %}
                 - location ~* \.(?:ttf|otf|eot|woff)$:
                     - add_header: Access-Control-Allow-Origin "*"