re-add redirects for prerelease

2018-05-01 12:20:50 +00:00 · 2018-05-01 12:20:50 +00:00 · 4bbe5105e2
commit 4bbe5105e2
parent c77dd04246
2 changed files with 205 additions and 203 deletions
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@ -78,70 +78,70 @@
  #
  # 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-gfo-atomic-redirectmatch
-    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-atomic-redirectmatch.conf state=absent
-    tags:
-    - httpd/redirect
-
-  - name: Remove prerelease-to-final-gfo-srv-redirectmatch
-    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-srv-redirectmatch.conf state=absent
-    tags:
-    - httpd/redirect
-
-  - name: Remove prerelease-to-final-gfo-ws-redirectmatch
-    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-ws-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
+#
+#  - 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-gfo-atomic-redirectmatch
+#    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-atomic-redirectmatch.conf state=absent
+#    tags:
+#    - httpd/redirect
+#
+#  - name: Remove prerelease-to-final-gfo-srv-redirectmatch
+#    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-srv-redirectmatch.conf state=absent
+#    tags:
+#    - httpd/redirect
+#
+#  - name: Remove prerelease-to-final-gfo-ws-redirectmatch
+#    file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo-ws-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

  roles:
  - httpd/mod_ssl
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@ -273,147 +273,149 @@
 # back to the main release.
 # This should be disabled when there is a prerelease

-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-gfo-ws
-#    website: getfedora.org
-#    regex: /(.*)workstation/prerelease.*$
-#    target: https://stg.getfedora.org/$1/workstation
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-gfo-srv
-#    website: getfedora.org
-#    regex: /(.*)server/prerelease.*$
-#    target: https://stg.getfedora.org/$1/server
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-gfo-atomic
-#    website: getfedora.org
-#    regex: /(.*)atomic/prerelease.*$
-#    target: https://stg.getfedora.org/$1/atomic
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-labs-1
-#    website: labs.fedoraproject.org
-#    regex: /(.*)prerelease.*$
-#    target: https://labs.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-spins-1
-#    website: spins.fedoraproject.org
-#    regex: /(.*)prerelease.*$
-#    target: https://spins.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-arm-1
-#    website: arm.fedoraproject.org
-#    regex: /(.*)prerelease.*$
-#    target: https://arm.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-labs-2
-#    website: labs.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://labs.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-spins-2
-#    website: spins.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://spins.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-arm-2
-#    website: arm.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://arm.stg.fedoraproject.org/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: cloud-to-atomic
-#    website: getfedora.org
-#    regex: /cloud/.*$
-#    target: https://alt.stg.fedoraproject.org/cloud/$1
-#    when: env == 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: cloud-to-atomic-download
-#    website: getfedora.org
-#    regex: /(.*)/cloud/download.*$
-#    target: https://alt.stg.fedoraproject.org/$1/cloud
-#    when: env == 'staging'
-#
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-gfo-ws
+    website: getfedora.org
+    regex: /(.*)workstation/prerelease.*$
+    target: https://stg.getfedora.org/$1/workstation
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-gfo-srv
+    website: getfedora.org
+    regex: /(.*)server/prerelease.*$
+    target: https://stg.getfedora.org/$1/server
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-gfo-atomic
+    website: getfedora.org
+    regex: /(.*)atomic/prerelease.*$
+    target: https://stg.getfedora.org/$1/atomic
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-labs-1
+    website: labs.fedoraproject.org
+    regex: /(.*)prerelease.*$
+    target: https://labs.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-spins-1
+    website: spins.fedoraproject.org
+    regex: /(.*)prerelease.*$
+    target: https://spins.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-arm-1
+    website: arm.fedoraproject.org
+    regex: /(.*)prerelease.*$
+    target: https://arm.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-labs-2
+    website: labs.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://labs.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-spins-2
+    website: spins.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://spins.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-arm-2
+    website: arm.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://arm.stg.fedoraproject.org/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: cloud-to-atomic
+    website: getfedora.org
+    regex: /cloud/.*$
+    target: https://alt.stg.fedoraproject.org/cloud/$1
+    when: env == 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: cloud-to-atomic-download
+    website: getfedora.org
+    regex: /(.*)/cloud/download.*$
+    target: https://alt.stg.fedoraproject.org/$1/cloud
+    when: env == 'staging'
+
 # end staging

-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-gfo-ws
-#    website: getfedora.org
-#    regex: /(.*)workstation/prerelease.*$
-#    target: https://getfedora.org/$1/workstation
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-gfo-srv
-#    website: getfedora.org
-#    regex: /(.*)server/prerelease.*$
-#    target: https://getfedora.org/$1/server
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-gfo-atomic
-#    website: getfedora.org
-#    regex: /(.*)atomic/prerelease.*$
-#    target: https://getfedora.org/$1/atomic
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-labs-1
-#    website: labs.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://labs.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-spins-1
-#    website: spins.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://spins.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-arm-1
-#    website: arm.fedoraproject.org
-#    regex: /(.*)/prerelease.*$
-#    target: https://arm.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-labs-2
-#    website: labs.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://labs.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-spins-2
-#    website: spins.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://spins.fedoraproject.org/$1
-#    when: env != 'staging'
-#
-#  - role: httpd/redirectmatch
-#    shortname: prerelease-to-final-arm-2
-#    website: arm.fedoraproject.org
-#    regex: /prerelease.*$
-#    target: https://arm.fedoraproject.org/$1
-#    when: env != 'staging'
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-gfo-ws
+    website: getfedora.org
+    regex: /(.*)workstation/prerelease.*$
+    target: https://getfedora.org/$1/workstation
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-gfo-srv
+    website: getfedora.org
+    regex: /(.*)server/prerelease.*$
+    target: https://getfedora.org/$1/server
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-gfo-atomic
+    website: getfedora.org
+    regex: /(.*)atomic/prerelease.*$
+    target: https://getfedora.org/$1/atomic
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-labs-1
+    website: labs.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-spins-1
+    website: spins.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://spins.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-arm-1
+    website: arm.fedoraproject.org
+    regex: /(.*)/prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-labs-2
+    website: labs.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://labs.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-spins-2
+    website: spins.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://spins.fedoraproject.org/$1
+    when: env != 'staging'
+
+  - role: httpd/redirectmatch
+    shortname: prerelease-to-final-arm-2
+    website: arm.fedoraproject.org
+    regex: /prerelease.*$
+    target: https://arm.fedoraproject.org/$1
+    when: env != 'staging'
+
+# end of prod prerelease

  - role: httpd/redirectmatch
    shortname: cloud-to-atomic