Freeze break: do not redirect staging websites

[Robert Mayr]

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)

[Kevin Fenzi]

On Mon, 14 Mar 2016 12:22:29 +0100
Robert Mayr <robyduck(a)fedoraproject.org&gt; wrote:

>  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. 
I don't see the pre_tasks listed? 
Thats where we removed the old redirects last time... as long as they
have a staging conditional it should be ok. 

>  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. 
Yep. absolutely. 

>  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. 
Yeah, we will need to. 

+1 here in any case. Should be fine. 

kevin
--
>  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]

2016-03-14 22:08 GMT+01:00 Kevin Fenzi <kevin(a)scrye.com&gt;:

>  On Mon, 14 Mar 2016 12:22:29 +0100
>  Robert Mayr <robyduck(a)fedoraproject.org&gt; wrote:
>
>  > 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.
>
>  I don't see the pre_tasks listed?
>  Thats where we removed the old redirects last time... as long as they
>  have a staging conditional it should be ok.
>
>  > 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.
>
>  Yep. absolutely.
>
>  > 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.
>
>  Yeah, we will need to.
>
>  +1 here in any case. Should be fine.
>
>  kevin
>  --
>
>  
Yeah, sorry, I attached a file. Here are the pre_tasks:

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'

[Ralph Bean]

On Mon, Mar 14, 2016 at 12:22:29PM +0100, Robert Mayr wrote:
>  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. 
+1 to the idea.  However, I think I found a bug:

>  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....
> state=absent
>  +  - name: Remove prerelease-to-final-spins-1
>  +    file:
> path=/etc/httpd/conf.d/spins.fedoraproject.org/prerelease-to-final-spins-...
> state=absent
>  +    when: env == 'staging' 
Look in /etc/httpd/conf.d/blah.fp.o/ on the proxy01.stg node and see
that the file name you're trying to remove here has the role name
appended to it.

So, it's not

    prerelease-to-final-spins.conf

but instead is:

    prerelease-to-final-spins-redirectmatch.conf

Longer term, it is kind of annoying that when we comment out one of
those roles, we have to go back and add pre_tasks to clean up.
Perhaps we should add a state=absent argument to the role itself so
that it knows how to clean itself up.  (Let's save that until after
freeze.)

[Robert Mayr]

2016-03-15 16:19 GMT+01:00 Ralph Bean <rbean(a)redhat.com&gt;:

>  On Mon, Mar 14, 2016 at 12:22:29PM +0100, Robert Mayr wrote:
>  > 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.
>
>  +1 to the idea.  However, I think I found a bug:
>
>  > 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'
>
>  Look in /etc/httpd/conf.d/blah.fp.o/ on the proxy01.stg node and see
>  that the file name you're trying to remove here has the role name
>  appended to it.
>
>  So, it's not
>
>      prerelease-to-final-spins.conf
>
>  but instead is:
>
>      prerelease-to-final-spins-redirectmatch.conf
>
>  Longer term, it is kind of annoying that when we comment out one of
>  those roles, we have to go back and add pre_tasks to clean up.
>  Perhaps we should add a state=absent argument to the role itself so
>  that it knows how to clean itself up.  (Let's save that until after
>  freeze.)
>
>  _______________________________________________
>  infrastructure mailing list
>  infrastructure(a)lists.fedoraproject.org
>
>  http://lists.fedoraproject.org/admin/lists/[e-mail]...
>
>  
Thank you, fixed and pushed.

-- 
Robert Mayr
(robyduck)