Page MenuHomePhabricator
Create Task
Maniphest T310738

Setup redirect of policy.wikimedia.org to Advocacy portal on Foundation website
Closed, ResolvedPublic
Actions

Description

Hello!

In line with other redirects from wikimedia.org subdomains to Wikimedia Foundation website (examples: annual.wikimedia.org and transparency.wikimedia.org) - Communications and Legal departments within the Wikimedia Foundation are working on a new iteration of the Advocacy portal within the Wikimedia Foundation website (located at https://wikimediafoundation.org/advocacy/). In preparation for that, we are closing down the existing public policy site (located at https://policy.wikimedia.org) and redirecting it to this new location. The contract for the web hosting renews for the year at the end of this month, so we would like to setup the redirect and close the old site before then. It has already been archived, and we have another URL we can access the site via until it is closed by the host.

As such, the Communications and Legal departments within the Foundation are requesting that:

  • 'policy.wikimedia.org' be redirected to 'wikimediafoundation.org/advocacy/'

This can be setup whenever it is ready, and has been approved by both departments. Please let me know as lead on org websites initiative if you have any questions. Thank you!

Details

SubjectRepoBranchLines +/-
switch policy.wikimedia.org back from Wordpress to WMF DNSoperations/dnsmaster+2 -2
mediawiki: redirect policy and related sites to wikimediafoundation.orgoperations/puppetproduction+24 -5
httpbb: add tests for policy.wikimedia.org, fixcopyright.wikimedia.orgoperations/puppetproduction+18 -0
Customize query in gerrit

Related Objects

Event Timeline

Varnent created this task.Jun 15 2022, 7:01 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJun 15 2022, 7:01 PM

As the WMF-Legal project tag was added to this task, some general information to avoid wrong expectations:
Please note that public tasks in Wikimedia Phabricator are in general not a place where to expect feedback from the Legal Team of the Wikimedia Foundation due to the scope of the team and/or nature of legal topics. See the project tag description.
Please see https://meta.wikimedia.org/wiki/Legal for when and how to contact the Legal Team. Thanks!

Varnent added a subscriber: Slaporte.Jun 15 2022, 7:07 PM
Varnent added a subscriber: LDickinsonWMF.
Dzahn subscribed.Jun 15 2022, 7:20 PM

just a note for serviceops: policy.wikimedia.org is not currently under the control of SRE/prod servers at WMF. It's hosted at Wordpress VIP.

policy.wikimedia.org has address 192.0.66.2 (but there is T132104)

Dzahn mentioned this in T132104: Consider moving policy.wikimedia.org away from WordPress.com .Jun 15 2022, 7:22 PM
Dzahn added a comment.Jun 15 2022, 7:28 PM

There are incoming redirects into policy.wikimedia.org:

https://wikimedia.org/stopsurveillance -> https://policy.wikimedia.org/stopsurveillance/

https://fixcopyright.wikimedia.org -> https://policy.wikimedia.org/policy-landing/copyright/

Are these redirect targets going to exist on the new site as well or do they need to be adjusted / should they be dropped?

Maintenance_bot added a project: Traffic.Jun 15 2022, 7:29 PM
SLyngshede-WMF triaged this task as Medium priority.Jun 16 2022, 7:40 AM
Varnent added a comment.Jun 21 2022, 8:28 PM
In T310738#8007136, @Dzahn wrote:

There are incoming redirects into policy.wikimedia.org:

https://wikimedia.org/stopsurveillance -> https://policy.wikimedia.org/stopsurveillance/

https://fixcopyright.wikimedia.org -> https://policy.wikimedia.org/policy-landing/copyright/

Are these redirect targets going to exist on the new site as well or do they need to be adjusted / should they be dropped?

I think what probably makes the most sense for now is to redirect them to their archives.

We could also create an archive subdomain as we did with the Transparency Report.

So the final setup would be:

@Dzahn - is that doable? I am not sure if we have redirected to web.archive.org before - although I think the 9/11 Wiki archive link does.

Dzahn added a comment.Jun 21 2022, 9:18 PM
In T310738#8017973, @Varnent wrote:

@Dzahn - is that doable? I am not sure if we have redirected to web.archive.org before - although I think the 9/11 Wiki archive link does.

@Varnent The big blocker here is that currently policy.wikimedia.org is not under the control of SRE but hosted external. We can't do much there. Either whoever maintains that on Wordpress VIP would have to implement the redirects on their side or the policy subdomain would first have to move back to the Wikimedia DNS. (for that I suggest involving traffic team).

But if I am assuming this was moved back to WMF production, yea, then that should be doable. (though does not mean necessarily I would be the one to deploy that, I was just trying to clarify for all involved). But yea, I agree we have once done that before, for the 9/11 archive wiki, that's right.

Varnent added a comment.Jun 21 2022, 10:50 PM
In T310738#8018203, @Dzahn wrote:
In T310738#8017973, @Varnent wrote:

@Dzahn - is that doable? I am not sure if we have redirected to web.archive.org before - although I think the 9/11 Wiki archive link does.

@Varnent The big blocker here is that currently policy.wikimedia.org is not under the control of SRE but hosted external. We can't do much there. Either whoever maintains that on Wordpress VIP would have to implement the redirects on their side or the policy subdomain would first have to move back to the Wikimedia DNS. (for that I suggest involving traffic team).

But if I am assuming this was moved back to WMF production, yea, then that should be doable. (though does not mean necessarily I would be the one to deploy that, I was just trying to clarify for all involved). But yea, I agree we have once done that before, for the 9/11 archive wiki, that's right.

We are "closing" this site on the VIP site. So, essentially whenever we want on our side - we can bring that back to our DNS setup and after a little gap time, I can give them go ahead to fully remove things from their systems.

I have a meeting soon with VIP to sort out the billing/contract details of the update - but they are aware on the technical side and I have some ability to "flip off switches" while we resolve paperwork matters (that whole aspect more relates to pausing the auto-renewal in place - basically).

Dzahn mentioned this in T110203: migrate policy.wikimedia.org from WMF cluster to Wordpress.Jun 22 2022, 9:47 PM
Dzahn added a comment.Jun 22 2022, 11:17 PM
In T310738#8018422, @Varnent wrote:

We are "closing" this site on the VIP site. So, essentially whenever we want on our side - we can bring that back to our DNS setup...

Gotcha. So that would be kind of reverting T110203 but not as a microsite, only for redirects. Sounds like it would also solve T132104. I have left comments on these tickets.

I have a meeting soon with VIP ..

ACK. Let me escalate this to managers for cross-team coordination.

Varnent added a comment.Jun 24 2022, 7:40 PM

My meeting will happen before they shut things off - so there will likely be a slight delay into July - and I should have a trick we can utilize on VIP/WordPress side if need be. :)

gerritbot added a comment.Jun 24 2022, 8:23 PM

Change 808309 had a related patch set uploaded (by Dzahn; author: Dzahn):

[operations/dns@master] switch policy.wikimedia.org back from Wordpress to WMF DNS

https://gerrit.wikimedia.org/r/808309

gerritbot added a project: Patch-For-Review.Jun 24 2022, 8:23 PM
LSobanski subscribed.Jun 27 2022, 5:58 PM

@Varnent could we get a clarification of the timeline for this request? The description says end of this month and your recent comment mentions a delay into July.

LSobanski added a comment.Jun 28 2022, 4:03 PM

@Varnent After chatting about this some more, how about we do the following:

gerritbot added a comment.Jun 28 2022, 11:53 PM

Change 809324 had a related patch set uploaded (by Dzahn; author: Dzahn):

[operations/puppet@production] mediawiki/appservers: redirect policy and related sites to wikimediafoundation.org/advocacy/

https://gerrit.wikimedia.org/r/809324

Varnent added a comment.Jun 28 2022, 11:54 PM
In T310738#8030481, @LSobanski wrote:

@Varnent could we get a clarification of the timeline for this request? The description says end of this month and your recent comment mentions a delay into July.

That timeline is more billing related. We are ready for the redirects to put in place as soon as everything is ready.

Dzahn added a project: collaboration-services.Jun 28 2022, 11:58 PM
In T310738#8033789, @LSobanski wrote:

@Varnent After chatting about this some more, how about we do the following:

The change https://gerrit.wikimedia.org/r/809324 aims to translate that to code.

gerritbot added a comment.Jun 30 2022, 7:24 PM

Change 810073 had a related patch set uploaded (by Dzahn; author: Dzahn):

[operations/puppet@production] httpbb: add tests for policy.wikimedia.org, fixcopyright.wikimedia.org

https://gerrit.wikimedia.org/r/810073

gerritbot added a comment.Jun 30 2022, 7:57 PM

Change 810073 abandoned by Dzahn:

[operations/puppet@production] httpbb: add tests for policy.wikimedia.org, fixcopyright.wikimedia.org

Reason:

merged into https://gerrit.wikimedia.org/r/c/operations/puppet/+/809324/

https://gerrit.wikimedia.org/r/810073

Varnent added a comment.Jul 6 2022, 10:00 PM
In T310738#8035453, @Dzahn wrote:
In T310738#8033789, @LSobanski wrote:

@Varnent After chatting about this some more, how about we do the following:

The change https://gerrit.wikimedia.org/r/809324 aims to translate that to code.

I shared the proposed setup with Legal department contacts and they agree this is a good option. Please go ahead and deploy as soon as you all are able/ready. Thank you!!!

Varnent added a comment.Jul 11 2022, 8:47 PM
In T310738#8035453, @Dzahn wrote:
In T310738#8033789, @LSobanski wrote:

@Varnent After chatting about this some more, how about we do the following:

The change https://gerrit.wikimedia.org/r/809324 aims to translate that to code.

Just wanted to check on if there is anything else you are waiting from me on. I think we are good to go with this patch. Thank you @Dzahn and @LSobanski!

Stashbot added a comment.Jul 21 2022, 8:39 PM

Mentioned in SAL (#wikimedia-operations) [2022-07-21T20:39:04Z] <mutante> disabling puppet on mw appservers to deploy gerrit:809324 - T310738

gerritbot added a comment.Jul 21 2022, 8:43 PM

Change 809324 merged by Dzahn:

[operations/puppet@production] mediawiki: redirect policy and related sites to wikimediafoundation.org

https://gerrit.wikimedia.org/r/809324

Stashbot added a comment.Jul 21 2022, 8:52 PM

Mentioned in SAL (#wikimedia-operations) [2022-07-21T20:52:38Z] <mutante> deploying apache config change on cluster, slowly..puppet disabled on C:profile::mediawiki::httpd .. then re-enabling starting with mwdebug.. using httpbb to test it.. then re-enabling puppet on more hosts https://gerrit.wikimedia.org/r/c/operations/puppet/+/809324 Bug: T310738

Dzahn added a comment.Jul 21 2022, 11:33 PM

This has been deployed to all appservers and passes the tests in redirects and all other tests on all the hosts:

[deploy1002:~] $ for tests in foundation main redirects remnant secure wikimania_wikimedia wwwportals; do httpbb /srv/deployment/httpbb-tests/appserver/test_${tests}.yaml --hosts=mw[1319-1333,1349-1355,1364-1373,1384-1385,1387,1389,1391,1393,1395,1397,1399,1401,1403,1405,1407,1409,1411,1413-1420,1429-1436,1441-1442,1451-1456].eqiad.wmnet,mwdebug[1001-1002].eqiad.wmnet
eqiad:

Sending to 73 hosts...
PASS: 7 requests sent to each of 73 hosts. All assertions passed.
Sending to 73 hosts...
PASS: 51 requests sent to each of 73 hosts. All assertions passed.
Sending to 73 hosts...
PASS: 10 requests sent to each of 73 hosts. All assertions passed.
Sending to 73 hosts...
PASS: 37 requests sent to each of 73 hosts. All assertions passed.
Sending to 73 hosts...
PASS: 5 requests sent to each of 73 hosts. All assertions passed.
Sending to 73 hosts...
PASS: 12 requests sent to each of 73 hosts. All assertions passed.
Sending to 73 hosts...
PASS: 2 requests sent to each of 73 hosts. All assertions passed.
[deploy2002:~] $ for tests in foundation main redirects remnant secure wikimania_wikimedia wwwportals; do httpbb /srv/deployment/httpbb-tests/appserver/test_${tests}.yaml --hosts=mw[2254-2255,2257-2258,2268-2277,2301,2303,2305,2307,2309-2316,2325,2327,2329,2331,2333,2335-2339,2359,2361,2363,2365,2367,2369,2371,2373,2375,2377-2380,2383-2393,2406-2409,2412-2415].codfw.wmnet,mwdebug[2001-2002].codfw.wmnet; done
codfw:

Sending to 70 hosts...
PASS: 7 requests sent to each of 70 hosts. All assertions passed.
Sending to 70 hosts...
PASS: 51 requests sent to each of 70 hosts. All assertions passed.
Sending to 70 hosts...
PASS: 10 requests sent to each of 70 hosts. All assertions passed.
Sending to 70 hosts...
PASS: 37 requests sent to each of 70 hosts. All assertions passed.
Sending to 70 hosts...
PASS: 5 requests sent to each of 70 hosts. All assertions passed.
Sending to 70 hosts...
https://transitionteam.wikimedia.org/wiki/Main_Page (/srv/deployment/httpbb-tests/appserver/test_wikimania_wikimedia.yaml:26)
  mw2305.codfw.wmnet
    Status code: expected 200, got 503.
    Body: expected to contain 'Transition Team Wiki', got 'upstream connect error or disconnect/reset before '... (95 characters total).
===
FAIL: 12 requests sent to each of 70 hosts. 1 request with failed assertions.
Sending to 70 hosts...
PASS: 2 requests sent to each of 70 hosts. All assertions passed.
Dzahn added a comment.Jul 21 2022, 11:40 PM

test from external:

curl -H "Host: policy.wikimedia.org" https://dyna.wikimedia.org 
..
<p>The document has moved <a href="https://wikimediafoundation.org/advocacy/">here</a>.</p>
curl -H "Host: fixcopyright.wikimedia.org" https://dyna.wikimedia.org 
...
<p>The document has moved <a href="https://policy.wikimedia.org/policy-landing/copyright/">here</a>.</p>

Will move ahead with the DNS change.

gerritbot added a comment.Jul 21 2022, 11:48 PM

Change 808309 merged by Dzahn:

[operations/dns@master] switch policy.wikimedia.org back from Wordpress to WMF DNS

https://gerrit.wikimedia.org/r/808309

Stashbot added a comment.Jul 21 2022, 11:53 PM

Mentioned in SAL (#wikimedia-operations) [2022-07-21T23:53:04Z] <mutante> https://policy.wikimedia.org moved from Wordpress DNS back to WMF DNS - now redirects to https://wikimediafoundation.org/advocacy/ as requested on T310738 | this might also resolve T132104 or not because wikimediafoundation.org is also on wordpress VIP

Dzahn added a comment.Jul 21 2022, 11:57 PM
In T310738#8070654, @Varnent wrote:

Just wanted to check on if there is anything else you are waiting from me on. I think we are good to go with this patch. Thank you @Dzahn and @LSobanski!

Hi @Varnent, this is done now. Sorry about the delay, it was mostly due to inspiration week.

The Apache change has been deployed to the cluster and tested on all appservers.. then tested from external.

Then I went ahead with the DNS change as well. It just happened a couple minutes ago.

I can already see https://policy.wikimedia.org redirects now to https://wikimediafoundation.org/advocacy/ .

also http://fixcopyright.wikimedia.org and https://wikimedia.org/stopsurveillance

I would call this resolved.

Dzahn changed the task status from Open to In Progress.Jul 21 2022, 11:59 PM
Dzahn raised the priority of this task from Medium to High.
Dzahn closed this task as Resolved.EditedJul 22 2022, 12:14 AM
Dzahn claimed this task.

curl https://policy.wikimedia.org
..

<p>The document has moved ..https://wikimediafoundation.org/advocacy/ ... here ..

Maintenance_bot removed a project: Patch-For-Review.Jul 22 2022, 12:30 AM
Varnent mentioned this in T341233: Change soundlogo.wikimedia.org to redirect to page on Foundation website.Jul 12 2023, 9:14 PM
Pppery mentioned this in T186373: Update photo caption on policy.wikimedia.org.Oct 24 2023, 12:36 AM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL