Fix up redirects in production too

playbooks/groups/proxies.yml

@@ -76,19 +76,15 @@
 
   - name: Remove prerelease-to-final-spins
     file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins.conf state=absent
-    when: env == 'staging'
 
   - name: Remove prerelease-to-final-labs
     file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs.conf state=absent
-    when: env == 'staging'
 
   - name: Remove prerelease-to-final-gfo
     file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo.conf state=absent
-    when: env == 'staging'
 
   - name: Remove prerelease-to-final-arm
     file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-gfo.conf state=absent
-    when: env == 'staging'
 
   roles:
   - httpd/proxy

playbooks/include/proxies-redirects.yml

@@ -278,19 +278,47 @@
     when: env != 'staging'
 
   - role: httpd/redirectmatch
-    name: prerelease-to-final-labs
+    name: prerelease-to-final-labs-1
     website: labs.fedoraproject.org
     regex: /(.*)/prerelease.*$
     target: https://labs.fedoraproject.org/$1
     when: env != 'staging'
 
   - role: httpd/redirectmatch
-    name: prerelease-to-final-spins
+    name: prerelease-to-final-spins-1
     website: spins.fedoraproject.org
     regex: /(.*)/prerelease.*$
     target: https://spins.fedoraproject.org/$1
     when: env != 'staging'
 
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-1
+    website: arm.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-labs-2
+    website: labs.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-spins-2
+    website: spins.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://spins.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    name: prerelease-to-final-arm-2
+    website: arm.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
+
   - role: httpd/redirect
     name: store
     website: store.fedoraproject.org