[MediaWiki-commits] [Gerrit] operations/puppet[production]: Swap from protocol-relative urls to https everywhere

Jcrespo (Code Review) Thu, 16 Feb 2017 10:54:14 -0800

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332707 )


Change subject: Swap from protocol-relative urls to https everywhere
......................................................................


Swap from protocol-relative urls to https everywhere

None of these URLs will ever go back to being non-https. Also, per the
linked task, not all clients behave well with protocol-relative URLs,
so avoiding them except when absolutely necessary is good for them.

Bug: T54253
Change-Id: I0e827951bce99d7ad65fc64babaaa3f41513e8d2
---
M modules/dataset/files/html/analytics_index.html
M modules/dataset/files/html/pagecounts-ez_index.html
M modules/mirrors/files/index.html
M modules/publichtml/templates/index.html.erb
M modules/toollabs/manifests/proxy.pp
M modules/toolserver_legacy/files/index.html
M modules/toolserver_legacy/files/notfound.html
M modules/varnish/files/errorpage.html
8 files changed, 18 insertions(+), 18 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Jcrespo: Verified; Looks good to me, approved



diff --git a/modules/dataset/files/html/analytics_index.html 
b/modules/dataset/files/html/analytics_index.html
index 93b003e..98e3ff4 100644
--- a/modules/dataset/files/html/analytics_index.html
+++ b/modules/dataset/files/html/analytics_index.html
@@ -113,7 +113,7 @@
             <p>Data compiled by community and staff, from projects hosted by 
the Wikimedia Foundation.</p>
 
             <p>
-                <strong>Pageviews</strong>: statistics compiled using the 
current <a href="//meta.wikimedia.org/wiki/Research:Page_view" 
target="_blank">Pageview Definition</a>.  Available as:
+                <strong>Pageviews</strong>: statistics compiled using the 
current <a href="https://meta.wikimedia.org/wiki/Research:Page_view"; 
target="_blank">Pageview Definition</a>.  Available as:
                 <ul>
                     <li><a href="/other/pageviews">Pageview/projectview data 
filtered to what we believe is only human traffic</a>.  Available since May 
2015.</li>
                     <li>
diff --git a/modules/dataset/files/html/pagecounts-ez_index.html 
b/modules/dataset/files/html/pagecounts-ez_index.html
index 3a384f7..faf25e2 100644
--- a/modules/dataset/files/html/pagecounts-ez_index.html
+++ b/modules/dataset/files/html/pagecounts-ez_index.html
@@ -31,7 +31,7 @@
                     <a href="/other/pagecounts-raw/">pagecount/projectcount 
files</a>
                 </li>
                 <li>From May 2015 onward: derived from files generated with the
-                    <a href="//meta.wikimedia.org/wiki/Research:Page_view">new 
Pageview Definition</a>.
+                    <a 
href="https://meta.wikimedia.org/wiki/Research:Page_view";>new Pageview 
Definition</a>.
                     Available separately as
                     <a href="/other/pageviews">pageview/projectview files</a>
                 </li>
diff --git a/modules/mirrors/files/index.html b/modules/mirrors/files/index.html
index d72f8c2..1549627 100644
--- a/modules/mirrors/files/index.html
+++ b/modules/mirrors/files/index.html
@@ -88,9 +88,9 @@
 <body>
        <div id="globalWrapper">
                <div id="content">
-      <h1><img alt="Wikimedia Mirrors" 
src="//upload.wikimedia.org/wikipedia/commons/thumb/2/2b/Wmf_logo_horiz_pms.svg/200px-Wmf_logo_horiz_pms.svg.png"></img></h1>
+      <h1><img alt="Wikimedia Mirrors" 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/2b/Wmf_logo_horiz_pms.svg/200px-Wmf_logo_horiz_pms.svg.png";></img></h1>
                        <p>
-      Welcome to mirrors.wikimedia.org, a service of the <a 
href="//wikimediafoundation.org/">Wikimedia Foundation</a>. The site contains 
mirrors of <strong>third-party</strong> archives. These are currently only 
offered via <em>http</em>, although <em>ftp</em> and <em>rsync</em> may be 
offered in the future
+      Welcome to mirrors.wikimedia.org, a service of the <a 
href="https://wikimediafoundation.org/";>Wikimedia Foundation</a>. The site 
contains mirrors of <strong>third-party</strong> archives. These are currently 
only offered via <em>http</em>, although <em>ftp</em> and <em>rsync</em> may be 
offered in the future
                        </p>
                        <h2>Contents</h2>
                        <dl>
diff --git a/modules/publichtml/templates/index.html.erb 
b/modules/publichtml/templates/index.html.erb
index 44e23cf..2155895 100644
--- a/modules/publichtml/templates/index.html.erb
+++ b/modules/publichtml/templates/index.html.erb
@@ -22,13 +22,13 @@
 See <a 
href="https://wikitech.wikimedia.org/wiki/People.wikimedia.org";>Wikitech</a> 
for more information.
 </p>
 <p>
-<a href="//commons.wikimedia.org/wiki/File:Wikimania_2015_-_Group_photo.jpg">
-<img alt="Several hundred people posing for a group photo at Wikimania 2015 at 
Museum Soumaya in Mexico City." 
src="//upload.wikimedia.org/wikipedia/commons/thumb/7/7c/Wikimania_2015_-_Group_photo.jpg/640px-Wikimania_2015_-_Group_photo.jpg"
 height="425" width="640" />
+<a 
href="https://commons.wikimedia.org/wiki/File:Wikimania_2015_-_Group_photo.jpg";>
+<img alt="Several hundred people posing for a group photo at Wikimania 2015 at 
Museum Soumaya in Mexico City." 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7c/Wikimania_2015_-_Group_photo.jpg/640px-Wikimania_2015_-_Group_photo.jpg";
 height="425" width="640" />
 </a><br>
-"<a 
href="//commons.wikimedia.org/wiki/File:Wikimania_2015_-_Group_photo.jpg">Wikimania_2015_-_Group_photo.jpg</a>"
- by ©&nbsp;<a href="//commons.wikimedia.org/wiki/User:EneasMx" 
title="User:EneasMx">EneasMx</a>
+"<a 
href="https://commons.wikimedia.org/wiki/File:Wikimania_2015_-_Group_photo.jpg";>Wikimania_2015_-_Group_photo.jpg</a>"
+ by ©&nbsp;<a href="https://commons.wikimedia.org/wiki/User:EneasMx"; 
title="User:EneasMx">EneasMx</a>
 <span class="int-own-work">Own work</span>. Licensed under
 <a title="Creative Commons Attribution-Share Alike 4.0 International" 
href="//creativecommons.org/licenses/by-sa/4.0/deed.en">CC-BY-SA-4.0</a>
-via <a href="//commons.wikimedia.org/">Wikimedia Commons</a>.
+via <a href="https://commons.wikimedia.org/";>Wikimedia Commons</a>.
 </p>
 </html>
diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index a9dcab2..b293ff5 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -39,7 +39,7 @@
             logo_alt => 'Wikimedia Tool Labs',
             favicon  => '/.error/favicon.ico',
         },
-        banned_description   => 'You have been banned from accessing Tool 
Labs. Please see <a 
href="//wikitech.wikimedia.org/wiki/Help:Tool_Labs/Banned">Help:Tool 
Labs/Banned</a> for more information on why and on how to resolve this.',
+        banned_description   => 'You have been banned from accessing Tool 
Labs. Please see <a 
href="https://wikitech.wikimedia.org/wiki/Help:Tool_Labs/Banned";>Help:Tool 
Labs/Banned</a> for more information on why and on how to resolve this.',
         web_domain           => $web_domain,
     }
 
diff --git a/modules/toolserver_legacy/files/index.html 
b/modules/toolserver_legacy/files/index.html
index 847e629..ddadb31 100644
--- a/modules/toolserver_legacy/files/index.html
+++ b/modules/toolserver_legacy/files/index.html
@@ -6,7 +6,7 @@
   </HEAD>
   <BODY STYLE="text-align: center;">
     <H1>We've moved!</H1>
-      <A 
HREF="//wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation">
+      <A 
HREF="https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation";>
         <IMG 
SRC="https://upload.wikimedia.org/wikipedia/commons/b/be/Wikimedia_Community_Logo-Toolserver.svg";
          HEIGHT="200" WIDTH="200" STYLE="margins: 2em;" alt="Toolserver Logo" 
/>
         <IMG 
SRC="https://upload.wikimedia.org/wikipedia/commons/1/13/Go-next-grey.svg";
@@ -19,9 +19,9 @@
       The Wikimedia Toolserver was a collaborative platform providing Unix 
hosting
       for various software tools written and used by Wikimedia editors and 
operated by
       <A HREF="http://www.wikimedia.de/";>Wikimedia Deutschland e.V.</A>
-      It has been replaced by the <A 
HREF="//wikitech.wikimedia.org/">Wikimedia Labs</A>,
+      It has been replaced by the <A 
HREF="https://wikitech.wikimedia.org/";>Wikimedia Labs</A>,
       with the services that used to be provided by the Toolserver available 
through the
-      <A 
HREF="//wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation">Tool 
Labs</A> project.
+      <A 
HREF="https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation";>Tool
 Labs</A> project.
     </DIV>
   </BODY>
 </HTML>
diff --git a/modules/toolserver_legacy/files/notfound.html 
b/modules/toolserver_legacy/files/notfound.html
index 2c01768..abd6cdb 100644
--- a/modules/toolserver_legacy/files/notfound.html
+++ b/modules/toolserver_legacy/files/notfound.html
@@ -6,7 +6,7 @@
   </HEAD>
   <BODY STYLE="text-align: center;">
     <H1>We've moved!</H1>
-      <A 
HREF="//wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation">
+      <A 
HREF="https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation";>
         <IMG 
SRC="https://upload.wikimedia.org/wikipedia/commons/b/be/Wikimedia_Community_Logo-Toolserver.svg";
          HEIGHT="200" WIDTH="200" STYLE="margins: 2em;" alt="Toolserver Logo" 
/>
         <IMG 
SRC="https://upload.wikimedia.org/wikipedia/commons/1/13/Go-next-grey.svg";
@@ -20,14 +20,14 @@
       did not leave a forwarding URL where we could automatically redirect 
you.</B>
       <P>
       You may find the tool you are looking for, or another similar tool, by
-      consulting the Tool Lab's <A HREF="//tools.wmflabs.org/">index of 
tools</A>.
+      consulting the Tool Lab's <A HREF="https://tools.wmflabs.org/";>index of 
tools</A>.
       <P>
       The Wikimedia Toolserver was a collaborative platform providing Unix 
hosting
       for various software tools written and used by Wikimedia editors and 
operated by
       <A HREF="http://www.wikimedia.de/";>Wikimedia Deutschland e.V.</A>
-      It has been replaced by the <A 
HREF="//wikitech.wikimedia.org/">Wikimedia Labs</A>,
+      It has been replaced by the <A 
HREF="https://wikitech.wikimedia.org/";>Wikimedia Labs</A>,
       with the services that used to be provided by the Toolserver available 
through the
-      <A 
HREF="//wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation">Tool 
Labs</A> project.
+      <A 
HREF="https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Documentation";>Tool
 Labs</A> project.
     </DIV>
   </BODY>
 </HTML>
diff --git a/modules/varnish/files/errorpage.html 
b/modules/varnish/files/errorpage.html
index 262e552..395fdef 100644
--- a/modules/varnish/files/errorpage.html
+++ b/modules/varnish/files/errorpage.html
@@ -17,7 +17,7 @@
 .text-muted { color: #777; }
 </style>
 <div class="content" role="main">
-<a href="//www.wikimedia.org"><img 
src="//www.wikimedia.org/static/images/wmf.png" 
srcset="//www.wikimedia.org/static/images/wmf-2x.png 2x" alt=Wikimedia 
width=135 height=135></a>
+<a href="https://www.wikimedia.org";><img 
src="https://www.wikimedia.org/static/images/wmf.png"; 
srcset="https://www.wikimedia.org/static/images/wmf-2x.png 2x" alt=Wikimedia 
width=135 height=135></a>
 <h1>Error</h1>
 <p>Our servers are currently under maintenance or experiencing a technical 
problem. Please <a href="" title="Reload this page" 
onclick="window.location.reload(false); return false">try again</a> in a 
few&nbsp;minutes.</p><p>See the error message at the bottom of this page for 
more&nbsp;information.</p>
 </div>

-- 
To view, visit https://gerrit.wikimedia.org/r/332707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e827951bce99d7ad65fc64babaaa3f41513e8d2
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Coren <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Swap from protocol-relative urls to https everywhere

Reply via email to