redirect staging prerelease pages excepts server - still needs config files to be removed

playbooks/include/proxies-redirects.yml

@@ -262,68 +262,82 @@
 # back to the main release.
 # This should be disabled when there is a prerelease
 
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-gfo-ws
+    website: getfedora.org
+    regex: /(.*)/workstation/prerelease.*$
+    target: https://stg.getfedora.org/$1
+    when: env == 'staging'
+
 #  - role: httpd/redirectmatch
-#    name: prerelease-to-final-gfo
+#    name: prerelease-to-final-gfo-srv
 #    website: getfedora.org
-#    regex: /(.*)/prerelease.*$
+#    regex: /(.*)/server/prerelease.*$
 #    target: https://stg.getfedora.org/$1
 #    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-1
-#    website: labs.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://labs.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-1
-#    website: spins.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://spins.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-1
-#    website: arm.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://arm.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-labs-2
-#    website: labs.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://labs.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-spins-2
-#    website: spins.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://spins.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: prerelease-to-final-arm-2
-#    website: arm.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://arm.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: cloud-to-atomic
-#    website: getfedora.org
-#    regex: /cloud/.*$
-#    target: https://alt.stg.fedoraproject.org/cloud/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    name: cloud-to-atomic-download
-#    website: getfedora.org
-#    regex: /(.*)/cloud/download.*$
-#    target: https://alt.stg.fedoraproject.org/$1/cloud
-#    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-gfo-atomic
+    website: getfedora.org
+    regex: /(.*)/atomic/prerelease.*$
+    target: https://stg.getfedora.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-1
+    website: labs.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://labs.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-1
+    website: spins.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://spins.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-1
+    website: arm.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://arm.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-2
+    website: labs.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://labs.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-2
+    website: spins.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://spins.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-2
+    website: arm.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://arm.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: cloud-to-atomic
+    website: getfedora.org
+    regex: /cloud/.*$
+    target: https://alt.stg.fedoraproject.org/cloud/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    name: cloud-to-atomic-download
+    website: getfedora.org
+    regex: /(.*)/cloud/download.*$
+    target: https://alt.stg.fedoraproject.org/$1/cloud
+    when: env == 'staging'
 
 # end staging