drop the prerelease redirect in staging only

2017-03-13 20:50:03 +00:00 · 2017-03-13 20:50:03 +00:00 · ce31f4de5e
commit ce31f4de5e
parent d3d8c9ec3b
2 changed files with 107 additions and 97 deletions
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@ -75,55 +75,65 @@
  #
  # 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
-#    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
-#    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
-#    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
-#    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
-#    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
-#    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
-#    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
-#    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
-#    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
-#    tags:
-#    - httpd/redirect
+  - 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
+    tags:
+    - httpd/redirect
+    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"
+
+  - 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"
+
+  - 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"
+
+  - 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"
+
+  - 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"
+
+  - 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"
+
+  - 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"
+
+  - 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"

  roles:
  - httpd/mod_ssl
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@ -249,54 +249,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