Reckon https://annual.wikimedia.org/2016/ is probably the best shout here; 2016.wikimediafoundation.org would be a totally different format to that used in the past so probably not advisable.

https://annual.wikimedia.org/2016/ is the way to go here. (We setup https://annual.wikimedia.org/2014/ https://annual.wikimedia.org/2015/ anticipating this request )

btw, the URL structure even works for /2007/ through /2013/ older reports, we have rewrite rules for that sending you to the old page on wikimediafoundation.org wiki

The setup for this is in 2 places:

a) repo operations/puppet , modules/annualreport

This sets up annual.wikimedia.org itself and makes puppet clone content but should not usually need an edit each year.

b) repo wikimedia/annualreport

This is where the actual content of the docroot lives and new content for each year should be uploaded.

So what is to do is:

git clone https://gerrit.wikimedia.org/r/p/wikimedia/annualreport

and "mkdir 2016" and upload the new content into that.

Then once content under /2016/ looks good, the index.html can be changed so that it does not redirect to the special 15 page anymore but to the normal /2016/ report and that will be it.

Change 323899 had a related patch set uploaded (by Dzahn):
add placeholder index for 2016 report

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

Change 323899 merged by Dzahn:
add placeholder index for 2016 report

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

Here you go.

https://annual.wikimedia.org/2016/

Does this resolve the ticket to create the URL?

Or did you want to keep it open until the real content is ready and released?

In T151798#2828771, @Dzahn wrote:

https://annual.wikimedia.org/2016/
Does this resolve the ticket to create the URL?
Or did you want to keep it open until the real content is ready and released?

@ZMcCune: ping?

@Heather: Any reason not to use https://annual.wikimedia.org/2016/?

@Dzahn: Thank you! We will let you know. Hope to have the static pages ready in early January.

That looks good. Thanks, everyone!

In T151798#2894164, @ZMcCune wrote:

@Dzahn: Thank you! We will let you know. Hope to have the static pages ready in early January.

@ZMcCune: Any news to share, now that it's late January? :)

Change 339328 had a related patch set uploaded (by Dzahn):
add 2016 annual report data

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

I've reviewed both content and technical implementation of the 2016 Annual Report and found no major security problems. Here are a few notes on minor things:

• "amoritization" on 2016/financials.html may be misspelled
• In the video at the bottom of 2016/what-we-stand-for.html, at approx. 1:21, is it okay to show the list of users who have visited the office?
• Use of Katherine and Jimmy's signatures may be useful in instances an attacker requires a signature on a physical form as part of a further attack. (I say this realizing that we've probably published Katherine and Jimmy's signatures before.
• X-Frame-Options header is not set on live site (https://annual.wikimedia.org/2016/)

Full ZAP scan result:

Thank you so much @dpatrick!

• Will check spelling on financials.html
• Legal reviewed the video and said all content was OK
• I asked @Heather about signatures and she reported that they are both widely available. Jimmy's signature is even on Commons

Change 339328 merged by Dzahn:
add 2016 annual report data

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

In T151798#3053857, @dpatrick wrote:

I've reviewed both content and technical implementation

Thank you! Way more detailed than expected and very fast.

I merged it after:

• "amoritization" on 2016/financials.html may be misspelled

Fixed in https://gerrit.wikimedia.org/r/#/c/339328/4

• In the video at the bottom..
• Use of Katherine and Jimmy's signatures...

Was OKed by legal.

• X-Frame-Options header is not set on live site (https://annual.wikimedia.org/2016/)

Looking at that now

Full ZAP scan result:

awesome :)

https://annual.wikimedia.org/2016/ is live but https://annual.wikimedia.org/ redirect was not changed yet ("soft launch").

Change 339803 had a related patch set uploaded (by Dzahn):
annualreport: add X-Frame-Options header to Apache config

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

Change 339803 merged by Dzahn:
annualreport: add X-Frame-Options header to Apache config

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

In T151798#3053857, @dpatrick wrote:

• X-Frame-Options header is not set on live site (https://annual.wikimedia.org/2016/)

Fixed with the change above. It now sends the header. Can be verified with https://tools.geekflare.com/web-tools/x-frame-options-test.

Change 339804 had a related patch set uploaded (by Dzahn):
switch index redirect from 2015 to 2016

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

Change 339804 merged by Dzahn:
switch index redirect from 2015 to 2016

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

Old index redirect is cached but that's known and ok that way until Monday.

Change 340263 had a related patch set uploaded (by Dzahn; owner: Dzahn):
update 2016 HTML pages, follow-up fix for social network sharing

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

Change 340263 merged by Dzahn:
update 2016 HTML pages, follow-up fix for social network sharing

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

Change 340351 had a related patch set uploaded (by Dzahn):
[wikimedia/annualreport] CSS-fix for 2016 content

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

Change 340351 merged by Dzahn:
CSS-fix for 2016 content

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

Change 340361 had a related patch set uploaded (by Dzahn):
[wikimedia/annualreport] fix broken FB links in Jimmy's letter page

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

Change 340361 merged by Dzahn:
fix broken FB links in Jimmy's letter page

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

patch set 2 of the changes above has been deployed just now

Seems like changed photos are not displaying (https://annual.wikimedia.org/2016/fact-8.html). @Varnent - any ideas on cause here?

Looks like the image "malasari-birdwatching.jpg" wasn't deployed or is mistyped.

In T151798#3085868, @jrbs wrote:

Looks like the image "malasari-birdwatching.jpg" wasn't deployed or is mistyped.

Oh, it looks like the image that is missing should be at https://annual.wikimedia.org/2016/img/fact-headers/malasari-birdwatching.jpg. It doesn't appear to be in the Gerrit file list so I would guess that it wasn't replaced (unless I'm missing something there).

Change 341924 had a related patch set uploaded (by Foks):
[wikimedia/annualreport] Add missing file

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

@jrbs The file was added as "2016/img/fact-cards/malasari-birdwatching-card.jpg" in https://gerrit.wikimedia.org/r/#/c/341756/

so should just be moved from fact-headers to fact-cards ?

Change 341924 merged by Dzahn:
[wikimedia/annualreport] Add missing file fact-headers/malasari-birdwatching.jpg

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

I see, they are different files/size with the same name, so needed in both locations.

deployed