re-add prerelease redirect in staging

playbooks/groups/proxies.yml

@@ -97,52 +97,52 @@
   # When we have a prerelease we also need to drop the config files.
 
   - 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
+    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - 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
+    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - 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
+    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - 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
+    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - 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
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - 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
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - name: Remove prerelease-to-final-gfo
-    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=absent
+    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - name: Remove prerelease-to-final-spins
-    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=absent
+    file: path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - name: Remove prerelease-to-final-labs
-    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=absent
+    file: path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 
   - name: Remove prerelease-to-final-arm
-    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=absent
+    file: path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-redirectmatch.conf state=file
     tags:
     - httpd/redirect
 

playbooks/include/proxies-redirects.yml

@@ -255,54 +255,54 @@
 # back to the main release.
 # This should be disabled when there is a prerelease
 
-#  - 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'
+  - 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'
 
   - role: httpd/redirectmatch
     name: cloud-to-atomic