BBlack has submitted this change and it was merged.

Change subject: Update links on dumps.wm.org to HTTPS
......................................................................


Update links on dumps.wm.org to HTTPS

Some links on https://dumps.wikimedia.org/ are hard-coded
"http:". I changed them to either "https:" or relative links.

Change-Id: Ic8abfffa607dbe19106a5b9cf927a38d788cf234
---
M modules/dataset/files/html/legal.html
M modules/dataset/files/html/pagecounts-ez_index.html
M modules/dataset/files/html/poty_index.html
M modules/dataset/files/html/public_index.html
4 files changed, 17 insertions(+), 17 deletions(-)

Approvals:
  BBlack: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dataset/files/html/legal.html 
b/modules/dataset/files/html/legal.html
index fc98664..07b4451 100644
--- a/modules/dataset/files/html/legal.html
+++ b/modules/dataset/files/html/legal.html
@@ -108,22 +108,22 @@
     <div id="globalWrapper">
         <div id="content">
             <h1>License information</h1>
-            <p>Wikimedia’s <a 
href="https://wikimediafoundation.org/wiki/Mission";>mission</a> is to create 
educational content that is freely available to all people. In keeping with 
that goal, all information on Wikimedia projects may be freely shared, copied, 
remixed, and used for any purpose (including commercial purposes!) in 
perpetuity. To help guide users of <a 
href="http://dumps.wikimedia.org/";>dumps.wikimedia.org</a>, this page contains 
more detailed information about Wikimedia’s licensing and licensing policies as 
they may apply to our dumps.</p>
+            <p>Wikimedia’s <a 
href="https://wikimediafoundation.org/wiki/Mission";>mission</a> is to create 
educational content that is freely available to all people. In keeping with 
that goal, all information on Wikimedia projects may be freely shared, copied, 
remixed, and used for any purpose (including commercial purposes!) in 
perpetuity. To help guide users of <a 
href="https://dumps.wikimedia.org/";>dumps.wikimedia.org</a>, this page contains 
more detailed information about Wikimedia’s licensing and licensing policies as 
they may apply to our dumps.</p>
             <div 
style="background:#ffeeee;border-width:1px;border-style:solid;border-color:red;padding:1em;font-size:large;">This
 is a high-level guide only. Where this information conflicts with specific 
information in the <a 
href="https://wikimediafoundation.org/wiki/Terms_of_Use";>Wikimedia Foundation 
Terms of Use</a>, or with other information contained inside the dumps 
themselves, this description should be ignored. Those terms are 
controlling.</div>
             <h2>Text</h2>
 
-<p>Except as discussed below, all original textual content is licensed under 
the <a href="http://www.wikipedia.org/wiki/Wikipedia:Copyrights"; 
title="Wikipedia Copyrights">
-GNU Free Documentation License</a> (GFDL) and the <a 
href="http://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons 
Attribution-Share-Alike 3.0 License">Creative Commons Attribution-Share-Alike 
3.0 License</a>.  Some text may be available only under the Creative Commons 
license; see our <a 
href="http://wikimediafoundation.org/wiki/Terms_of_use";>Terms of Use</a> for 
details. Text written by some authors may be released under additional licenses 
or into the public domain.</p>
+<p>Except as discussed below, all original textual content is licensed under 
the <a href="https://www.wikipedia.org/wiki/Wikipedia:Copyrights"; 
title="Wikipedia Copyrights">
+GNU Free Documentation License</a> (GFDL) and the <a 
href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons 
Attribution-Share-Alike 3.0 License">Creative Commons Attribution-Share-Alike 
3.0 License</a>.  Some text may be available only under the Creative Commons 
license; see our <a 
href="https://wikimediafoundation.org/wiki/Terms_of_use";>Terms of Use</a> for 
details. Text written by some authors may be released under additional licenses 
or into the public domain.</p>
             <h2>Images</h2>
-            <p>By default, images uploaded to our services are under the <a 
href="http://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons 
Attribution-Share-Alike 3.0 License">Creative Commons Attribution-Share-Alike 
3.0 License</a>. However, many images are NOT released under Creative Commons. 
Image copyright information is contained in the image description page inside 
the text dumps.<p>
+            <p>By default, images uploaded to our services are under the <a 
href="https://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons 
Attribution-Share-Alike 3.0 License">Creative Commons Attribution-Share-Alike 
3.0 License</a>. However, many images are NOT released under Creative Commons. 
Image copyright information is contained in the image description page inside 
the text dumps.<p>
             <h2>Exceptions</h2>
             <h3>Wikinews</h3>
-            <p>As of 2005-09-25 all Wikinews textual content is licensed under 
the <a href="http://creativecommons.org/licenses/by/2.5/"; title="Creative 
Commons Attribution 2.5 License">Creative Commons Attribution 2.5 License</a>. 
All Wikinews material published prior to that date (2005-09-25) is in the 
public domain.</p>
+            <p>As of 2005-09-25 all Wikinews textual content is licensed under 
the <a href="https://creativecommons.org/licenses/by/2.5/"; title="Creative 
Commons Attribution 2.5 License">Creative Commons Attribution 2.5 License</a>. 
All Wikinews material published prior to that date (2005-09-25) is in the 
public domain.</p>
             <h3>Wikidata</h3>
             <p>Rights in Wikidata are waived using <a 
href="https://creativecommons.org/publicdomain/zero/1.0/";>the Creative Commons 
Zero public domain dedication.</a></p>
 
             <h3>Fair use and other exceptions</h3>
-<p>Some text and images may be included when it is believed that this 
inclusion is permitted by <a href="http://en.wikipedia.org/wiki/Fair_use";>fair 
use</a> or other exceptions to copyright.  A list (possibly incomplete) of <a 
href="https://meta.wikimedia.org/wiki/Non-free_content";>relevant exceptions and 
policies can be found on our meta-wiki</a>. Use of this information may be a 
copyright violation if used in a different context than they are used on 
Wikipedia.</p>
+<p>Some text and images may be included when it is believed that this 
inclusion is permitted by <a href="https://en.wikipedia.org/wiki/Fair_use";>fair 
use</a> or other exceptions to copyright.  A list (possibly incomplete) of <a 
href="https://meta.wikimedia.org/wiki/Non-free_content";>relevant exceptions and 
policies can be found on our meta-wiki</a>. Use of this information may be a 
copyright violation if used in a different context than they are used on 
Wikipedia.</p>
             <h3>Potential infringements</h3>
             <p>Wikimedians diligently remove copyright infringements, but 
because that removal is an ongoing process, these dumps may contain some 
copyright infringements which have not yet been noticed and removed. Your use 
of this material is AT YOUR OWN RISK. Please let us know about any copyright 
infringements you find, so they can be removed.</p>
             <h2>More information: Legal</h2>
diff --git a/modules/dataset/files/html/pagecounts-ez_index.html 
b/modules/dataset/files/html/pagecounts-ez_index.html
index 1c13b77..f4f1241 100644
--- a/modules/dataset/files/html/pagecounts-ez_index.html
+++ b/modules/dataset/files/html/pagecounts-ez_index.html
@@ -8,7 +8,7 @@
         <h1>Wikistats files</h1>
         <b>Maintained by Erik Zachte</b>
         <p>
-                  <a 
href="http://dumps.wikimedia.org/other/pagecounts-ez/merged/";>
+                  <a href="merged/">
                     Hourly page views per article</a>
                   for around 30 million article titles
                   (Sept 2013) in around 800+ Wikimedia wikis. Repackaged (with 
extreme
@@ -16,21 +16,21 @@
                   files and two monthly files (see notes below).
                 </p>
         <p>
-                  <a 
href="http://dumps.wikimedia.org/other/pagecounts-ez/projectcounts/";>
+                  <a href="projectcounts/">
                     Hourly page views per wiki</a>
                   , corrected for site outages and underreporting. Also 
repackaged,
                   as one tar file per year.
                 </p>
         <p>
-                  <a 
href="http://dumps.wikimedia.org/other/pagecounts-ez/wikistats/";>
+                  <a href="wikistats/">
                     Raw data</a>
-                 for reports at <a 
href='http://stats.wikimedia.org/'>stats.wikimedia.org</a>.
+                 for reports at <a 
href='https://stats.wikimedia.org/'>stats.wikimedia.org</a>.
                 </p>
         <hr />
         <p><b>Notes for hourly page views</b></p>
         <p>
                   Both sets of hourly files have been derived from Domas'
-                  <a href="http://dumps.wikimedia.org/other/pagecounts-raw/";>
+                  <a href="/other/pagecounts-raw/">
                     pagecount/projectcount files</a>
                   but the format is different.
                 </p>
@@ -70,8 +70,8 @@
                 </p>
         <p>
                   Source for this information:
-                  <a 
href="http://lists.wikimedia.org/pipermail/wikitech-l/2011-August/054644.html";>
-                    
http://lists.wikimedia.org/pipermail/wikitech-l/2011-August/054591.html</a>.
+                  <a 
href="https://lists.wikimedia.org/pipermail/wikitech-l/2011-August/054644.html";>
+                    
https://lists.wikimedia.org/pipermail/wikitech-l/2011-August/054591.html</a>.
                 </p>
 
     </small>
diff --git a/modules/dataset/files/html/poty_index.html 
b/modules/dataset/files/html/poty_index.html
index a62bddd..a60c65b 100644
--- a/modules/dataset/files/html/poty_index.html
+++ b/modules/dataset/files/html/poty_index.html
@@ -88,8 +88,8 @@
 <hr />
 <p> Back to <a href="../">other data bundles</a> | <a href="../../">the main 
index page</a> </p>
 <p id="footer">For more information see
-<a 
href="http://commons.wikimedia.org/wiki/Commons:Picture_of_the_Year";>Picture of 
the Year</a>
-on <a href="http://commons.wikimedia.org/";>Wikimedia Commons</a>.</p>
+<a 
href="https://commons.wikimedia.org/wiki/Commons:Picture_of_the_Year";>Picture 
of the Year</a>
+on <a href="https://commons.wikimedia.org/";>Wikimedia Commons</a>.</p>
 
 </div>
 </body>
diff --git a/modules/dataset/files/html/public_index.html 
b/modules/dataset/files/html/public_index.html
index a2741cb..5b3e81c 100644
--- a/modules/dataset/files/html/public_index.html
+++ b/modules/dataset/files/html/public_index.html
@@ -116,7 +116,7 @@
                        may be blocked.
                        <p>
                        <h2>Data downloads</h2>
-                       <div 
style="background:#ffeeee;border-width:1px;border-style:solid;border-color:red;padding:1em;font-size:large;">The
 Wikimedia Foundation is requesting help to ensure that as many copies as 
possible are available of all Wikimedia database dumps. Please <strong><a 
href="http://meta.wikimedia.org/wiki/Mirroring_Wikimedia_project_XML_dumps";>volunteer
 to host a mirror</a></strong> if you have access to sufficient storage and 
bandwidth.</div>
+                       <div 
style="background:#ffeeee;border-width:1px;border-style:solid;border-color:red;padding:1em;font-size:large;">The
 Wikimedia Foundation is requesting help to ensure that as many copies as 
possible are available of all Wikimedia database dumps. Please <strong><a 
href="https://meta.wikimedia.org/wiki/Mirroring_Wikimedia_project_XML_dumps";>volunteer
 to host a mirror</a></strong> if you have access to sufficient storage and 
bandwidth.</div>
                        <dl>
                                <dt><a href="backup-index.html">Database backup 
dumps</a></dt>
                                <dd>A complete copy of all Wikimedia wikis, in 
the form of wikitext source and metadata embedded in XML. A number of raw 
database tables in SQL form are also available. </dd> <dd> These snapshots are 
provided at the very least monthly and usually twice a month. If you are a 
regular user of these dumps, please consider subscribing to <a 
href="https://lists.wikimedia.org/mailman/listinfo/xmldatadumps-l";>xmldatadumps-l</a>
 for regular updates.</dd>
@@ -143,7 +143,7 @@
                        </dl>
                        <h2>Software downloads</h2>
                        <dl>
-                               <dt><a 
href="http://www.mediawiki.org/wiki/Download";>MediaWiki</a></dt>
+                               <dt><a 
href="https://www.mediawiki.org/wiki/Download";>MediaWiki</a></dt>
                                <dd>MediaWiki is a free software wiki package 
written in PHP, originally for
                                use on Wikipedia. It is now used by several 
other projects of the
                                non-profit Wikimedia Foundation and by many 
other wikis.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8abfffa607dbe19106a5b9cf927a38d788cf234
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chmarkine <chmark...@hotmail.com>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Erik Zachte <ezac...@wikimedia.org>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to