Freeze Break Request: fix prerelease redirects on getfedora.org

[Kevin Fenzi]

From 85c547ceae99c648375f69e67722b6c152ca432f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin(a)scrye.com&gt;
Date: Mon, 12 Mar 2018 18:52:46 +0000
Subject: [PATCH] Tweak the prerelease redirects for
server/workstation/atomic.
 If using the default lang, there will not be a /NN/ code in the url
resulting
 in the redirect failing to work. So, we drop the / on the end and it works
 for both /en/workstation/prerelease and /workstation/prerelease. We need to
 fix this so users aren't directed to a Fedora 28 prerelease page even
before
 Beta.

Signed-off-by: Kevin Fenzi <kevin(a)scrye.com&gt;
---
 playbooks/include/proxies-redirects.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/playbooks/include/proxies-redirects.yml
b/playbooks/include/proxies-redirects.yml
index 068e402..78f8ff6 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -350,22 +350,22 @@
   - role: httpd/redirectmatch
     name: prerelease-to-final-gfo-ws
     website: getfedora.org
-    regex: /(.*)/workstation/prerelease.*$
-    target: https://getfedora.org/$1
+    regex: /(.*)workstation/prerelease.*$
+    target: https://getfedora.org/$1/workstation
     when: env != 'staging'

   - role: httpd/redirectmatch
     name: prerelease-to-final-gfo-srv
     website: getfedora.org
-    regex: /(.*)/server/prerelease.*$
-    target: https://getfedora.org/$1
+    regex: /(.*)server/prerelease.*$
+    target: https://getfedora.org/$1/server
     when: env != 'staging'

   - role: httpd/redirectmatch
     name: prerelease-to-final-gfo-atomic
     website: getfedora.org
-    regex: /(.*)/atomic/prerelease.*$
-    target: https://getfedora.org/$1
+    regex: /(.*)atomic/prerelease.*$
+    target: https://getfedora.org/$1/atomic
     when: env != 'staging'

   - role: httpd/redirectmatch
-- 
1.8.3.1

[Stephen John Smoogen]

Those look pretty consistent. +1! (1 factorial)

On 12 March 2018 at 14:55, Kevin Fenzi <kevin(a)scrye.com&gt; wrote:
>  From 85c547ceae99c648375f69e67722b6c152ca432f Mon Sep 17 00:00:00
> 2001
>  From: Kevin Fenzi <kevin(a)scrye.com&gt;
>  Date: Mon, 12 Mar 2018 18:52:46 +0000
>  Subject: [PATCH] Tweak the prerelease redirects for
>  server/workstation/atomic.
>   If using the default lang, there will not be a /NN/ code in the url
>  resulting
>   in the redirect failing to work. So, we drop the / on the end and it works
>   for both /en/workstation/prerelease and /workstation/prerelease. We need to
>   fix this so users aren't directed to a Fedora 28 prerelease page even
>  before
>   Beta.
>
>  Signed-off-by: Kevin Fenzi <kevin(a)scrye.com&gt;
>  ---
>   playbooks/include/proxies-redirects.yml | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
>  diff --git a/playbooks/include/proxies-redirects.yml
>  b/playbooks/include/proxies-redirects.yml
>  index 068e402..78f8ff6 100644
>  --- a/playbooks/include/proxies-redirects.yml
>  +++ b/playbooks/include/proxies-redirects.yml
>  @@ -350,22 +350,22 @@
>     - role: httpd/redirectmatch
>       name: prerelease-to-final-gfo-ws
>       website: getfedora.org
>  -    regex: /(.*)/workstation/prerelease.*$
>  -    target: https://getfedora.org/$1
>  +    regex: /(.*)workstation/prerelease.*$
>  +    target: https://getfedora.org/$1/workstation
>       when: env != 'staging'
>
>     - role: httpd/redirectmatch
>       name: prerelease-to-final-gfo-srv
>       website: getfedora.org
>  -    regex: /(.*)/server/prerelease.*$
>  -    target: https://getfedora.org/$1
>  +    regex: /(.*)server/prerelease.*$
>  +    target: https://getfedora.org/$1/server
>       when: env != 'staging'
>
>     - role: httpd/redirectmatch
>       name: prerelease-to-final-gfo-atomic
>       website: getfedora.org
>  -    regex: /(.*)/atomic/prerelease.*$
>  -    target: https://getfedora.org/$1
>  +    regex: /(.*)atomic/prerelease.*$
>  +    target: https://getfedora.org/$1/atomic
>       when: env != 'staging'
>
>     - role: httpd/redirectmatch
>  --
>  1.8.3.1
>
>
>  _______________________________________________
>  infrastructure mailing list -- infrastructure(a)lists.fedoraproject.org
>  To unsubscribe send an email to infrastructure-leave(a)lists.fedoraproject.org
>  


-- 
Stephen J Smoogen.

[Patrick マルタインアンドレアス Uiterwijk]

+1