drop prerelease redirects

playbooks/groups/proxies.yml

@@ -100,62 +100,62 @@
     file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-spins-2
     file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-labs-1
     file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-labs-2
     file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-arm-1
     file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-arm-2
     file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-gfo
     file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-spins
     file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
+#    when: env == 'staging'
 
   - name: Remove prerelease-to-final-labs
     file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
     tags:
     - httpd/redirect
-    when: env == 'staging'
-
-#  - name: Remove prerelease-to-final-arm
-#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
-#    tags:
-#    - httpd/redirect
 #    when: env == 'staging'
-#
+
+  - name: Remove prerelease-to-final-arm
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
+    tags:
+    - httpd/redirect
+#    when: env == 'staging'
+
   roles:
   - httpd/mod_ssl
   - httpd/proxy

playbooks/include/proxies-redirects.yml

@@ -327,54 +327,54 @@
 
 # end staging
 
-  - role: httpd/redirectmatch
-    name: prerelease-to-final-gfo
-    website: getfedora.org
-    regex: /(.*)/prerelease.*$
-    target: https://getfedora.org/$1
-    when: env != 'staging'
-
-  - role: httpd/redirectmatch
-    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-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/redirectmatch
+#    name: prerelease-to-final-gfo
+#    website: getfedora.org
+#    regex: /(.*)/prerelease.*$
+#    target: https://getfedora.org/$1
+#    when: env != 'staging'
+#
+#  - role: httpd/redirectmatch
+#    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-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/redirectmatch
     name: cloud-to-atomic