Rework the prerelease redirects to be a little better.

We want them to go away now in staging, at release (tomorrow) we adjust these to remove them in prod too

playbooks/groups/proxies.yml

@@ -72,36 +72,55 @@
   pre_tasks:
   #
   # When we have a prerelease we also need to drop the config files.
+  - block:
+
+     - name: Remove prerelease-to-final-spins-1
+       file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
+
+     - 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
+
+     - 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
+
+     - 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
+
+     - 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
+
+     - 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
+
+     - name: Remove prerelease-to-final-gfo
+       file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
+
+     - name: Remove prerelease-to-final-spins
+       file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
+
+     - name: Remove prerelease-to-final-labs
+       file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
+
+     - name: Remove prerelease-to-final-arm
+       file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
+    when: env == "staging"
 
-#  - name: Remove prerelease-to-final-spins-1
-#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=absent
 #
-#  - name: Remove prerelease-to-final-spins-2
+# The above when should be: 
-#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=absent
 #
-#  - name: Remove prerelease-to-final-labs-1
+# When there is a final release and we want redirects
-#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=absent
+# in both staging and prod
 #
-#  - name: Remove prerelease-to-final-labs-2
+#   when: not env
-#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=absent
 #
-#  - name: Remove prerelease-to-final-arm-1
+# When there is a prerelease only in staging
-#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=absent
 #
-#  - name: Remove prerelease-to-final-arm-2
+#   when: env == 'staging'
-#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=absent
 #
-#  - name: Remove prerelease-to-final-gfo
+# When there is a prerelease in production and staging
-#    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
 #
-#  - name: Remove prerelease-to-final-spins
+#   when: env
-#    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
 #
-#  - name: Remove prerelease-to-final-labs
-#    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
-#
-#  - name: Remove prerelease-to-final-arm
-#    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
 
   roles:
   - httpd/proxy

playbooks/include/proxies-redirects.yml

@@ -248,106 +248,67 @@
 # When there is no prerelease we redirect the prerelease urls
 # back to the main release.
 # This should be disabled when there is a prerelease
+#
 
+  - block:
      - 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-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'
+    when: env == 'production'
 
-# end staging
+# The above when should be: 
-
+#
-  - role: httpd/redirectmatch
+# When there is a final release and we want redirects
-    name: prerelease-to-final-gfo
+# in both staging and prod
-    website: getfedora.org
+#
-    regex: /(.*)/prerelease.*$
+#   when: env
-    target: https://getfedora.org/$1
+#
-    when: env != 'staging'
+# When there is a prerelease only in staging
-
+#
-  - role: httpd/redirectmatch
+#   when: env == 'production'
-    name: prerelease-to-final-labs-1
+#
-    website: labs.fedoraproject.org
+# When there is a prerelease in production and staging
-    regex: /(.*)/prerelease.*$
+#
-    target: https://labs.fedoraproject.org/$1
+#   when: not env
-    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/redirect
     name: store