From adbebb076ac0755ce8342be204c3a2d837c60f2b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 3 Nov 2015 12:40:43 +0000
Subject: [PATCH] Add get-prerelease and cloud redirects for f23

---
 playbooks/include/proxies-redirects.yml | 89 +++++++++++++++++++++----
 1 file changed, 76 insertions(+), 13 deletions(-)

diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index bd78cb339a..d0842b5fb5 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -213,20 +213,45 @@
 # When there is no prerelease we redirect the prerelease urls
 # back to the main release. 
 # This should be disabled when there is a prerelease
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final
-#    website: getfedora.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://stg.getfedora.org/$1
-#    when: env == 'staging'
 
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final
-#    website: getfedora.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://getfedora.org/$1
-#    when: env != 'staging'
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-gfo
+    website: getfedora.org
+    regex: /(.*)/prerelease.*$
+    target: https://stg.getfedora.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs
+    website: labs.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://labs.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins
+    website: spins.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://spins.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-gfo
+    website: getfedora.org
+    regex: /(.*)/prerelease.*$
+    target: https://getfedora.org/$1
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs
+    website: labs.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins
+    website: spins.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://spins.fedoraproject.org/$1
 
   - role: httpd/redirect
     name: store
@@ -326,6 +351,44 @@
 
   ## Cloud image redirects
 
+  # Redirects/pointers for fedora 23 BASE cloud images
+  - role: httpd/redirect
+    name: cloud-base-64bit-23
+    website: cloud.fedoraproject.org
+    path: /fedora-23.x86_64.qcow2
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-23-20151030.x86_64.qcow2
+
+  - role: httpd/redirect
+    name: cloud-base-64bit-23-raw
+    website: cloud.fedoraproject.org
+    path: /fedora-23.x86_64.raw.xz
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-23-20151030.x86_64.raw.xz
+
+  - role: httpd/redirect
+    name: cloud-base-32bit-23-raw
+    website: cloud.fedoraproject.org
+    path: /fedora-23.i386.raw.xz
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/i386/Images/Fedora-Cloud-Base-23-20151030.i386.raw.xz
+
+  - role: httpd/redirect
+    name: cloud-base-32bit-23
+    website: cloud.fedoraproject.org
+    path: /fedora-23.i386.qcow2
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/i386/Images/Fedora-Cloud-Base-23-20151030.i386.qcow2
+
+  # Redirects/pointers for fedora 23 ATOMIC cloud images
+  - role: httpd/redirect
+    name: cloud-atomic-64bit-23
+    website: cloud.fedoraproject.org
+    path: /fedora-atomic-23.x86_64.qcow2
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Atomic-23-20151030.x86_64.qcow2
+
+  - role: httpd/redirect
+    name: cloud-atomic-64bit-23-raw
+    website: cloud.fedoraproject.org
+    path: /fedora-atomic-23.x86_64.raw.xz
+    target: https://download.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Atomic-23-20151030.x86_64.raw.xz
+
   # Redirects/pointers for fedora 22 BASE cloud images
   - role: httpd/redirect
     name: cloud-base-64bit-22