Ok this is for staging websites, but it's a change in ansible and we change
some pre_tasks, so I ask for +1s to be sure.
Staging websites should not redirect prerelease pages, but show them
normally (while production must still redirect them to the main page). We
are just before readiness and should at least test them out.
I'd comment out the rules for staging as in the diff below, if we need to
drop also the config files on the proxies, I attach a diff also for
playbooks/groups/proxies.yml.
Thanks.
diff --git a/playbooks/include/proxies-redirects.yml
b/playbooks/include/proxies-redirects.yml
index b141527..ef323e1 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -216,57 +216,57 @@
#
# When there is no prerelease we redirect the prerelease urls
-# back to the main release.
+# 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'
# end staging
--
Robert Mayr
(robyduck)
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index 90d5001..1b46198 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -74,17 +74,33 @@
# When we have a prerelease we also need to drop the
# config files.
- - name: Remove prerelease-to-final-spins
- file:
path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins.conf
state=absent
+ - name: Remove prerelease-to-final-spins-1
+ file:
path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-1.conf
state=absent
+ when: env == 'staging'
- - name: Remove prerelease-to-final-labs
- file:
path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs.conf
state=absent
+ - name: Remove prerelease-to-final-spins-2
+ file:
path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-2.conf
state=absent
+ when: env == 'staging'
+
+ - name: Remove prerelease-to-final-labs-1
+ file:
path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-1.conf
state=absent
+ when: env == 'staging'
+
+ - name: Remove prerelease-to-final-labs-2
+ file:
path=/etc/httpd/conf.d/labs.fedoraproject.org/prerelease-to-final-labs-2.conf
state=absent
+ when: env == 'staging'
- name: Remove prerelease-to-final-gfo
file: path=/etc/httpd/conf.d/getfedora.org/prerelease-to-final-gfo.conf
state=absent
+ when: env == 'staging'
+
+ - name: Remove prerelease-to-final-arm-1
+ file:
path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-1.conf
state=absent
+ when: env == 'staging'
- - name: Remove prerelease-to-final-arm
- file:
path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-gfo.conf
state=absent
+ - name: Remove prerelease-to-final-arm-2
+ file:
path=/etc/httpd/conf.d/arm.fedoraproject.org/prerelease-to-final-arm-2.conf
state=absent
+ when: env == 'staging'
_______________________________________________
infrastructure mailing list
infrastructure@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/infrastructure@lists.fedoraproject.org
