proxies / redirects: drop workstation/server/atomic, they are no longer used, update labs and spins and arm

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

playbooks/include/proxies-redirects.yml

@@ -305,36 +305,12 @@
 # back to the main release.
 # This should be disabled when there is a prerelease
 
-  - role: httpd/redirectmatch
-    shortname: prerelease-to-final-gfo-ws
-    website: getfedora.org
-    regex: /(.*)workstation/prerelease.*$
-    target: https://stg.getfedora.org/$1/workstation
-    redirectmatch_enabled: false
-    when: env == 'staging'
-
-  - role: httpd/redirectmatch
-    shortname: prerelease-to-final-gfo-srv
-    website: getfedora.org
-    regex: /(.*)server/prerelease.*$
-    target: https://stg.getfedora.org/$1/server
-    redirectmatch_enabled: false
-    when: env == 'staging'
-
-  - role: httpd/redirectmatch
-    shortname: prerelease-to-final-gfo-atomic
-    website: getfedora.org
-    regex: /(.*)atomic/prerelease.*$
-    target: https://stg.getfedora.org/$1/atomic
-    redirectmatch_enabled: false
-    when: env == 'staging'
-
   - role: httpd/redirectmatch
     shortname: prerelease-to-final-labs-1
     website: labs.fedoraproject.org
     regex: /(.*)prerelease.*$
     target: https://labs.stg.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env == 'staging'
 
   - role: httpd/redirectmatch
@@ -342,7 +318,7 @@
     website: spins.fedoraproject.org
     regex: /(.*)prerelease.*$
     target: https://spins.stg.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env == 'staging'
 
   - role: httpd/redirectmatch
@@ -350,7 +326,7 @@
     website: arm.fedoraproject.org
     regex: /(.*)prerelease.*$
     target: https://arm.stg.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env == 'staging'
 
   - role: httpd/redirectmatch
@@ -358,7 +334,7 @@
     website: labs.fedoraproject.org
     regex: /prerelease.*$
     target: https://labs.stg.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env == 'staging'
 
   - role: httpd/redirectmatch
@@ -366,7 +342,7 @@
     website: spins.fedoraproject.org
     regex: /prerelease.*$
     target: https://spins.stg.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env == 'staging'
 
   - role: httpd/redirectmatch
@@ -374,7 +350,7 @@
     website: arm.fedoraproject.org
     regex: /prerelease.*$
     target: https://arm.stg.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env == 'staging'
 
   - role: httpd/redirectmatch
@@ -403,36 +379,12 @@
 
 # end staging
 
-  - role: httpd/redirectmatch
-    shortname: prerelease-to-final-gfo-ws
-    website: getfedora.org
-    regex: /(.*)workstation/prerelease.*$
-    target: https://getfedora.org/$1/workstation
-    redirectmatch_enabled: false
-    when: env != 'staging'
-
-  - role: httpd/redirectmatch
-    shortname: prerelease-to-final-gfo-srv
-    website: getfedora.org
-    regex: /(.*)server/prerelease.*$
-    target: https://getfedora.org/$1/server
-    redirectmatch_enabled: false
-    when: env != 'staging'
-
-  - role: httpd/redirectmatch
-    shortname: prerelease-to-final-gfo-atomic
-    website: getfedora.org
-    regex: /(.*)atomic/prerelease.*$
-    target: https://getfedora.org/$1/atomic
-    redirectmatch_enabled: false
-    when: env != 'staging'
-
   - role: httpd/redirectmatch
     shortname: prerelease-to-final-labs-1
     website: labs.fedoraproject.org
     regex: /(.*)/prerelease.*$
     target: https://labs.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env != 'staging'
 
   - role: httpd/redirectmatch
@@ -440,7 +392,7 @@
     website: spins.fedoraproject.org
     regex: /(.*)/prerelease.*$
     target: https://spins.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env != 'staging'
 
   - role: httpd/redirectmatch
@@ -448,7 +400,7 @@
     website: arm.fedoraproject.org
     regex: /(.*)/prerelease.*$
     target: https://arm.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env != 'staging'
 
   - role: httpd/redirectmatch
@@ -456,7 +408,7 @@
     website: labs.fedoraproject.org
     regex: /prerelease.*$
     target: https://labs.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env != 'staging'
 
   - role: httpd/redirectmatch
@@ -464,7 +416,7 @@
     website: spins.fedoraproject.org
     regex: /prerelease.*$
     target: https://spins.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env != 'staging'
 
   - role: httpd/redirectmatch
@@ -472,7 +424,7 @@
     website: arm.fedoraproject.org
     regex: /prerelease.*$
     target: https://arm.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env != 'staging'
 
   - role: httpd/redirectmatch
@@ -480,7 +432,7 @@
     website: alt.fedoraproject.org
     regex: /prerelease.*$
     target: https://alt.fedoraproject.org/$1
-    redirectmatch_enabled: false
+    redirectmatch_enabled: true
     when: env != 'staging'
 
 # end of prod prerelease