[Qemu-devel] [PATCH web 0/2] Secure the download links and more

[Qemu-devel] [PATCH web 0/2] Secure the download links and more

[Daniel P. Berrange]

Peter pointed out a bit of a crazy setup:

The front page link to the 2.10.0 tarball is

  http://download.qemu-project.org/qemu-2.10.0.tar.xz

which gets you a 301 redirect to

  http://download.qemu.org/qemu-2.10.0.tar.xz

which gets you a 301 redirect to

  https://download.qemu.org/qemu-2.10.0.tar.xz...

which gives the $BAD guys plenty chance to compromise your
download. Fix this to link to https:// sites exclusively
and use the preferred qemu.org domani too. All links are
fixed to use https, not merely download site links.

Daniel P. Berrange (2):
  Update all links to prefer qemu.org over qemu-project.org
  Use https links whereever possible

 .htaccess                                            |  6 +++---
 _download/source.html                                | 12 ++++++------
 _includes/footer.html                                | 18 +++++++++---------
 _includes/releases.html                              |  8 ++++----
 _posts/2017-02-04-the-new-qemu-website-is-up.md      | 10 +++++-----
 _posts/2017-03-19-qemu-in-the-blogs-february-2017.md |  4 ++--
 _posts/2017-08-10-deprecation.md                     |  2 +-
 contribute.md                                        |  8 ++++----
 contribute/report-a-bug.md                           |  6 +++---
 documentation.md                                     |  8 ++++----
 index.html                                           |  2 +-
 11 files changed, 42 insertions(+), 42 deletions(-)

-- 
2.13.5

[Qemu-devel] [PATCH web 1/2] Update all links to prefer qemu.org over qemu-project.org

[Daniel P. Berrange]

The qemu-project.org site sends a redirect to qemu.org, so
we should use qemu.org as a preferred link target to avoid
the redirects.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 .htaccess                                            |  6 +++---
 _download/source.html                                | 12 ++++++------
 _includes/footer.html                                | 10 +++++-----
 _includes/releases.html                              |  6 +++---
 _posts/2017-02-04-the-new-qemu-website-is-up.md      | 10 +++++-----
 _posts/2017-03-19-qemu-in-the-blogs-february-2017.md |  2 +-
 contribute.md                                        |  8 ++++----
 documentation.md                                     |  8 ++++----
 index.html                                           |  2 +-
 9 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/.htaccess b/.htaccess
index c037a2c..73da09b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,6 +3,6 @@ RewriteBase /
 RewriteRule ^Download$       /download/                          [R=301]
 RewriteRule ^Contribute$     /contribute/                        [R=301]
 RewriteRule ^Documentation$  /documentation/                     [R=301]
-RewriteRule ^[A-Z].*         http://wiki.qemu-project.org/$0     [NE,R]
-RewriteRule ^download(/.+)   http://download.qemu-project.org$1  [NE,R]
-RewriteRule ^images(/.+)   http://wiki.qemu-project.org/images$1 [NE,R]
+RewriteRule ^[A-Z].*         http://wiki.qemu.org/$0     [NE,R]
+RewriteRule ^download(/.+)   http://download.qemu.org$1  [NE,R]
+RewriteRule ^images(/.+)   http://wiki.qemu.org/images$1 [NE,R]
diff --git a/_download/source.html b/_download/source.html
index d090a5e..5e06ee7 100644
--- a/_download/source.html
+++ b/_download/source.html
@@ -1,21 +1,21 @@
 
 	<p>Grab the source code for the latest releases and compile it yourself!
 	Detailed compilation instructions can be found in the wiki for
-		<a href="http://wiki.qemu-project.org/Hosts/Linux">Linux</a>,
-		<a href="http://wiki.qemu-project.org/Hosts/Windows">Win32</a> and
-		<a href="http://wiki.qemu-project.org/Hosts/Mac">macOS</a>.</p>
+		<a href="http://wiki.qemu.org/Hosts/Linux">Linux</a>,
+		<a href="http://wiki.qemu.org/Hosts/Windows">Win32</a> and
+		<a href="http://wiki.qemu.org/Hosts/Mac">macOS</a>.</p>
 
 	<div id="releases">
 	{% include releases.html %}
 	</div>
 	<p>or stay on the bleeding edge with the
-	   <a href="http://git.qemu-project.org/">git repository!</a></p>
+	   <a href="http://git.qemu.org/">git repository!</a></p>
 
 	<h2>Build instructions</h2>
 
 	{% for release in site.data.releases offset: 0 limit: 1 %}
 	<p>To download and build QEMU {{release.branch}}.{{release.patch}}:</p>
-<pre>wget http://download.qemu-project.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz
+<pre>wget http://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz
 tar xvJf qemu-{{release.branch}}.{{release.patch}}.tar.xz
 cd qemu-{{release.branch}}.{{release.patch}}
 ./configure
@@ -24,7 +24,7 @@ make
 	{% endfor %}
 
 	<p>To download and build QEMU from git:</p>
-<pre>git clone git://git.qemu-project.org/qemu.git
+<pre>git clone git://git.qemu.org/qemu.git
 cd qemu
 git submodule init
 git submodule update --recursive
diff --git a/_includes/footer.html b/_includes/footer.html
index 7a3e8b1..979a477 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -8,15 +8,15 @@
 		<ul class="style">
 			<li><a href="/contribute">Contribute</a></li>
 			<li><a href="/contribute/report-a-bug">Reporting a bug</a></li>
-			<li><a href="http://wiki.qemu-project.org/Documentation/GettingStartedDevelopers">New contributors</a></li>
-			<li><a href="http://wiki.qemu-project.org/Contribute/SubmitAPatch">Submitting a patch</a></li>
-			<li><a href="http://wiki.qemu-project.org/Contribute/FAQ">Contributor FAQ</a></li>
+			<li><a href="http://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></li>
+			<li><a href="http://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></li>
+			<li><a href="http://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></li>
 		</ul>
 		<ul class="style">
 			<li><a href="/documentation">Documentation</a></li>
 			<li><a href="https://qemu.weilnetz.de/qemu-doc.html">Manual</a></li>
-			<li><a href="http://wiki.qemu-project.org/Category:Developer_documentation">Developer docs</a></li>
-			<li><a href="http://wiki.qemu-project.org/">Wiki</a></li>
+			<li><a href="http://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li>
+			<li><a href="http://wiki.qemu.org/">Wiki</a></li>
 		</ul>
 		<ul class="style">
 			<li><a href="http://planet.virt-tools.org/">virt tools planet</a></li>
diff --git a/_includes/releases.html b/_includes/releases.html
index 683d552..4881f83 100644
--- a/_includes/releases.html
+++ b/_includes/releases.html
@@ -1,10 +1,10 @@
 <ul>
 {% for release in site.data.releases offset: 0 limit: 4 %}
 <li><strong><a
-  href="http://download.qemu-project.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz">{{release.branch}}.{{release.patch}}</a></strong>
+  href="http://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz">{{release.branch}}.{{release.patch}}</a></strong>
   {{release.date}}<br><a
-  href="http://download.qemu-project.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz.sig">signature</a> &mdash; <a
-  href="http://wiki.qemu-project.org/ChangeLog/{{release.branch}}">changes</a></li>
+  href="http://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz.sig">signature</a> &mdash; <a
+  href="http://wiki.qemu.org/ChangeLog/{{release.branch}}">changes</a></li>
 {% endfor %}
 </ul>
 <p><a {% if page.url == '/' %}class="button"{%endif%} href="http://download.qemu.org/">Full list of releases</a><p>
diff --git a/_posts/2017-02-04-the-new-qemu-website-is-up.md b/_posts/2017-02-04-the-new-qemu-website-is-up.md
index 692e561..6dc5eeb 100644
--- a/_posts/2017-02-04-the-new-qemu-website-is-up.md
+++ b/_posts/2017-02-04-the-new-qemu-website-is-up.md
@@ -9,13 +9,13 @@ At last, QEMU's new website is up!
 
 The new site aims to be simple and provides the basic information
 needed to download and start contributing to QEMU.  It complements the
-[wiki](http://wiki.qemu-project.org/), which remains the central point for
+[wiki](http://wiki.qemu.org/), which remains the central point for
 developers to share information quickly with the rest of the community.
 
 We tried to test the website on most browsers and to make it lightweight
 and responsive.  It is built using [Jekyll](https://jekyllrb.com/)
 and the source code for the website can be cloned from the
-[qemu-web.git](http://git.qemu-project.org/?p=qemu-web.git;a=summary)
+[qemu-web.git](http://git.qemu.org/?p=qemu-web.git;a=summary)
 repository.  Just like for any other project hosted by QEMU, the best way
 to propose or contribute a new change is by sending a patch through the
 [qemu-devel@nongnu.org](https://lists.nongnu.org/mailman/listinfo/qemu-devel)
@@ -23,10 +23,10 @@ mailing list.
 
 For example, if you would like to add a new screenshot to the homepage,
 you can clone the `qemu-web.git` repository, add a PNG file to the
-[`screenshots/`](http://git.qemu-project.org/?p=qemu-web.git;a=tree;f=screenshots;hb=HEAD)
-directory, and edit the [`_data/screenshots.yml`](http://git.qemu-project.org/?p=qemu-web.git;a=blob;f=_data/screenshots.yml;hb=HEAD)
+[`screenshots/`](http://git.qemu.org/?p=qemu-web.git;a=tree;f=screenshots;hb=HEAD)
+directory, and edit the [`_data/screenshots.yml`](http://git.qemu.org/?p=qemu-web.git;a=blob;f=_data/screenshots.yml;hb=HEAD)
 file to include the new screenshot.
 
 Blog posts about QEMU are also welcome; they are simple HTML or Markdown
-files and are stored in the [`_posts/`](http://git.qemu-project.org/?p=qemu-web.git;a=tree;f=_posts;hb=HEAD)
+files and are stored in the [`_posts/`](http://git.qemu.org/?p=qemu-web.git;a=tree;f=_posts;hb=HEAD)
 directory of the repository.
diff --git a/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md b/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md
index 6540f45..42af6d2 100644
--- a/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md
+++ b/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md
@@ -32,4 +32,4 @@ More virtualization blog posts can be found on the [virt tools
 planet](http://planet.virt-tools.org/).
 
 In other news, QEMU is now in hard freeze for release 2.9.0.  The preliminary
-list of features is on the [wiki](http://wiki.qemu-project.org/ChangeLog/2.9).
+list of features is on the [wiki](http://wiki.qemu.org/ChangeLog/2.9).
diff --git a/contribute.md b/contribute.md
index b10ba7f..4ee31db 100644
--- a/contribute.md
+++ b/contribute.md
@@ -5,11 +5,11 @@ permalink: /contribute/
 
 * Report a bug: [https://bugs.launchpad.net/qemu/](https://bugs.launchpad.net/qemu/)<br>[How to report a bug](report-a-bug/)
 
-* Clone the git repository: <br>`git clone git://git.qemu-project.org/qemu.git`
+* Clone the git repository: <br>`git clone git://git.qemu.org/qemu.git`
 
-* Join the mailing list: [qemu-devel@nongnu.org](http://lists.nongnu.org/mailman/listinfo/qemu-devel)<br>[See the list of QEMU mailing lists](http://wiki.qemu-project.org/MailingLists)
+* Join the mailing list: [qemu-devel@nongnu.org](http://lists.nongnu.org/mailman/listinfo/qemu-devel)<br>[See the list of QEMU mailing lists](http://wiki.qemu.org/MailingLists)
 
 * Chat with the developers on IRC: irc.oftc.net, channel #qemu
 
-* Read developer documentation: &ldquo;[Getting started for developers](http://wiki.qemu-project.org/Documentation/GettingStartedDevelopers)&rdquo;,
-  &ldquo;[Contributor FAQ](http://wiki.qemu-project.org/Contribute/FAQ)&rdquo;, &ldquo;[How to submit a patch](http://wiki.qemu-project.org/Contribute/SubmitAPatch)&rdquo;
+* Read developer documentation: &ldquo;[Getting started for developers](http://wiki.qemu.org/Documentation/GettingStartedDevelopers)&rdquo;,
+  &ldquo;[Contributor FAQ](http://wiki.qemu.org/Contribute/FAQ)&rdquo;, &ldquo;[How to submit a patch](http://wiki.qemu.org/Contribute/SubmitAPatch)&rdquo;
diff --git a/documentation.md b/documentation.md
index de6acb9..4a63cc3 100644
--- a/documentation.md
+++ b/documentation.md
@@ -4,10 +4,10 @@ permalink: /documentation/
 ---
 
 The [QEMU user manual](https://qemu.weilnetz.de/qemu-doc.html) can be read online, courtesy of Stefan Weil.
-More documentation is found in the <a href="http://git.qemu-project.org/?p=qemu.git;a=tree;f=docs;hb=master">`docs`</a>
+More documentation is found in the <a href="http://git.qemu.org/?p=qemu.git;a=tree;f=docs;hb=master">`docs`</a>
 directory of the QEMU git tree.
 
-The [QEMU wiki](http://wiki.qemu-project.org) contains more
-[user documentation](http://wiki.qemu-project.org/Category:User_documentation) and
-[developer documentation](http://wiki.qemu-project.org/Category:Developer_documentation)
+The [QEMU wiki](http://wiki.qemu.org) contains more
+[user documentation](http://wiki.qemu.org/Category:User_documentation) and
+[developer documentation](http://wiki.qemu.org/Category:Developer_documentation)
 that has not been integrated into the QEMU git tree.
diff --git a/index.html b/index.html
index 5a78a15..f4c9c18 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@ $('.colorbox').on("click.random-namespace", function() {
 
 		</div>
 		<hr>
-		<p>QEMU is a member of <a href="http://wiki.qemu-project.org/Conservancy">Software Freedom Conservancy</a>.</p>
+		<p>QEMU is a member of <a href="http://wiki.qemu.org/Conservancy">Software Freedom Conservancy</a>.</p>
 	</div>
 </div>
 
-- 
2.13.5

[Qemu-devel] [PATCH web 2/2] Use https links whereever possible

[Daniel P. Berrange]

The following sites all support https

   qemu.org
   wiki.qemu.org
   git.qemu.org
   download.qemu.org
   planet.virt-tools.org
   libvirt.org
   www.linux-kvm.org
   xenproject.org

Update all links to these sites to use https. This is particularly
important for the links to the release downloads, to avoid the chance
of downloads being compromised

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 .htaccess                                            |  6 +++---
 _download/source.html                                | 10 +++++-----
 _includes/footer.html                                | 18 +++++++++---------
 _includes/releases.html                              |  8 ++++----
 _posts/2017-02-04-the-new-qemu-website-is-up.md      | 10 +++++-----
 _posts/2017-03-19-qemu-in-the-blogs-february-2017.md |  4 ++--
 _posts/2017-08-10-deprecation.md                     |  2 +-
 contribute.md                                        |  6 +++---
 contribute/report-a-bug.md                           |  6 +++---
 documentation.md                                     |  8 ++++----
 index.html                                           |  2 +-
 11 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.htaccess b/.htaccess
index 73da09b..baa6ef0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,6 +3,6 @@ RewriteBase /
 RewriteRule ^Download$       /download/                          [R=301]
 RewriteRule ^Contribute$     /contribute/                        [R=301]
 RewriteRule ^Documentation$  /documentation/                     [R=301]
-RewriteRule ^[A-Z].*         http://wiki.qemu.org/$0     [NE,R]
-RewriteRule ^download(/.+)   http://download.qemu.org$1  [NE,R]
-RewriteRule ^images(/.+)   http://wiki.qemu.org/images$1 [NE,R]
+RewriteRule ^[A-Z].*         https://wiki.qemu.org/$0     [NE,R]
+RewriteRule ^download(/.+)   https://download.qemu.org$1  [NE,R]
+RewriteRule ^images(/.+)   https://wiki.qemu.org/images$1 [NE,R]
diff --git a/_download/source.html b/_download/source.html
index 5e06ee7..d64d7ba 100644
--- a/_download/source.html
+++ b/_download/source.html
@@ -1,21 +1,21 @@
 
 	<p>Grab the source code for the latest releases and compile it yourself!
 	Detailed compilation instructions can be found in the wiki for
-		<a href="http://wiki.qemu.org/Hosts/Linux">Linux</a>,
-		<a href="http://wiki.qemu.org/Hosts/Windows">Win32</a> and
-		<a href="http://wiki.qemu.org/Hosts/Mac">macOS</a>.</p>
+		<a href="https://wiki.qemu.org/Hosts/Linux">Linux</a>,
+		<a href="https://wiki.qemu.org/Hosts/Windows">Win32</a> and
+		<a href="https://wiki.qemu.org/Hosts/Mac">macOS</a>.</p>
 
 	<div id="releases">
 	{% include releases.html %}
 	</div>
 	<p>or stay on the bleeding edge with the
-	   <a href="http://git.qemu.org/">git repository!</a></p>
+	   <a href="https://git.qemu.org/">git repository!</a></p>
 
 	<h2>Build instructions</h2>
 
 	{% for release in site.data.releases offset: 0 limit: 1 %}
 	<p>To download and build QEMU {{release.branch}}.{{release.patch}}:</p>
-<pre>wget http://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz
+<pre>wget https://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz
 tar xvJf qemu-{{release.branch}}.{{release.patch}}.tar.xz
 cd qemu-{{release.branch}}.{{release.patch}}
 ./configure
diff --git a/_includes/footer.html b/_includes/footer.html
index 979a477..1669ef7 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -8,22 +8,22 @@
 		<ul class="style">
 			<li><a href="/contribute">Contribute</a></li>
 			<li><a href="/contribute/report-a-bug">Reporting a bug</a></li>
-			<li><a href="http://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></li>
-			<li><a href="http://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></li>
-			<li><a href="http://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></li>
+			<li><a href="https://wiki.qemu.org/Documentation/GettingStartedDevelopers">New contributors</a></li>
+			<li><a href="https://wiki.qemu.org/Contribute/SubmitAPatch">Submitting a patch</a></li>
+			<li><a href="https://wiki.qemu.org/Contribute/FAQ">Contributor FAQ</a></li>
 		</ul>
 		<ul class="style">
 			<li><a href="/documentation">Documentation</a></li>
 			<li><a href="https://qemu.weilnetz.de/qemu-doc.html">Manual</a></li>
-			<li><a href="http://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li>
-			<li><a href="http://wiki.qemu.org/">Wiki</a></li>
+			<li><a href="https://wiki.qemu.org/Category:Developer_documentation">Developer docs</a></li>
+			<li><a href="https://wiki.qemu.org/">Wiki</a></li>
 		</ul>
 		<ul class="style">
-			<li><a href="http://planet.virt-tools.org/">virt tools planet</a></li>
-			<li><a href="http://www.linux-kvm.org/">KVM</a></li>
+			<li><a href="https://planet.virt-tools.org/">virt tools planet</a></li>
+			<li><a href="https://www.linux-kvm.org/">KVM</a></li>
 			<li><a href="http://libguestfs.org/">Libguestfs</a></li>
-			<li><a href="http://libvirt.org/">Libvirt</a></li>
-			<li><a href="http://xenproject.org">Xen</a></li>
+			<li><a href="https://libvirt.org/">Libvirt</a></li>
+			<li><a href="https://xenproject.org">Xen</a></li>
 		</ul>
 	</div>
 </div>
diff --git a/_includes/releases.html b/_includes/releases.html
index 4881f83..2e95631 100644
--- a/_includes/releases.html
+++ b/_includes/releases.html
@@ -1,10 +1,10 @@
 <ul>
 {% for release in site.data.releases offset: 0 limit: 4 %}
 <li><strong><a
-  href="http://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz">{{release.branch}}.{{release.patch}}</a></strong>
+  href="https://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz">{{release.branch}}.{{release.patch}}</a></strong>
   {{release.date}}<br><a
-  href="http://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz.sig">signature</a> &mdash; <a
-  href="http://wiki.qemu.org/ChangeLog/{{release.branch}}">changes</a></li>
+  href="https://download.qemu.org/qemu-{{release.branch}}.{{release.patch}}.tar.xz.sig">signature</a> &mdash; <a
+  href="https://wiki.qemu.org/ChangeLog/{{release.branch}}">changes</a></li>
 {% endfor %}
 </ul>
-<p><a {% if page.url == '/' %}class="button"{%endif%} href="http://download.qemu.org/">Full list of releases</a><p>
+<p><a {% if page.url == '/' %}class="button"{%endif%} href="https://download.qemu.org/">Full list of releases</a><p>
diff --git a/_posts/2017-02-04-the-new-qemu-website-is-up.md b/_posts/2017-02-04-the-new-qemu-website-is-up.md
index 6dc5eeb..66d3181 100644
--- a/_posts/2017-02-04-the-new-qemu-website-is-up.md
+++ b/_posts/2017-02-04-the-new-qemu-website-is-up.md
@@ -9,13 +9,13 @@ At last, QEMU's new website is up!
 
 The new site aims to be simple and provides the basic information
 needed to download and start contributing to QEMU.  It complements the
-[wiki](http://wiki.qemu.org/), which remains the central point for
+[wiki](https://wiki.qemu.org/), which remains the central point for
 developers to share information quickly with the rest of the community.
 
 We tried to test the website on most browsers and to make it lightweight
 and responsive.  It is built using [Jekyll](https://jekyllrb.com/)
 and the source code for the website can be cloned from the
-[qemu-web.git](http://git.qemu.org/?p=qemu-web.git;a=summary)
+[qemu-web.git](https://git.qemu.org/?p=qemu-web.git;a=summary)
 repository.  Just like for any other project hosted by QEMU, the best way
 to propose or contribute a new change is by sending a patch through the
 [qemu-devel@nongnu.org](https://lists.nongnu.org/mailman/listinfo/qemu-devel)
@@ -23,10 +23,10 @@ mailing list.
 
 For example, if you would like to add a new screenshot to the homepage,
 you can clone the `qemu-web.git` repository, add a PNG file to the
-[`screenshots/`](http://git.qemu.org/?p=qemu-web.git;a=tree;f=screenshots;hb=HEAD)
-directory, and edit the [`_data/screenshots.yml`](http://git.qemu.org/?p=qemu-web.git;a=blob;f=_data/screenshots.yml;hb=HEAD)
+[`screenshots/`](https://git.qemu.org/?p=qemu-web.git;a=tree;f=screenshots;hb=HEAD)
+directory, and edit the [`_data/screenshots.yml`](https://git.qemu.org/?p=qemu-web.git;a=blob;f=_data/screenshots.yml;hb=HEAD)
 file to include the new screenshot.
 
 Blog posts about QEMU are also welcome; they are simple HTML or Markdown
-files and are stored in the [`_posts/`](http://git.qemu.org/?p=qemu-web.git;a=tree;f=_posts;hb=HEAD)
+files and are stored in the [`_posts/`](https://git.qemu.org/?p=qemu-web.git;a=tree;f=_posts;hb=HEAD)
 directory of the repository.
diff --git a/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md b/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md
index 42af6d2..01e8e7d 100644
--- a/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md
+++ b/_posts/2017-03-19-qemu-in-the-blogs-february-2017.md
@@ -29,7 +29,7 @@ and KVM, that were posted last month.
   by Daniel P. Berrangé
 
 More virtualization blog posts can be found on the [virt tools
-planet](http://planet.virt-tools.org/).
+planet](https://planet.virt-tools.org/).
 
 In other news, QEMU is now in hard freeze for release 2.9.0.  The preliminary
-list of features is on the [wiki](http://wiki.qemu.org/ChangeLog/2.9).
+list of features is on the [wiki](https://wiki.qemu.org/ChangeLog/2.9).
diff --git a/_posts/2017-08-10-deprecation.md b/_posts/2017-08-10-deprecation.md
index c01a116..d0a7a35 100644
--- a/_posts/2017-08-10-deprecation.md
+++ b/_posts/2017-08-10-deprecation.md
@@ -22,5 +22,5 @@ chapter of the QEMU documentation to see whether you are still using one of
 these old interfaces or features, so you can adapt your setup to use the new
 interfaces/features instead. Or if you rather think that one of the items
 should *not* be removed from QEMU at all, please speak up on the
-[qemu-devel mailing list](http://wiki.qemu.org/Contribute/MailingLists)
+[qemu-devel mailing list](https://wiki.qemu.org/Contribute/MailingLists)
 to explain why the interface or feature is still required.
diff --git a/contribute.md b/contribute.md
index 4ee31db..bf4a55d 100644
--- a/contribute.md
+++ b/contribute.md
@@ -7,9 +7,9 @@ permalink: /contribute/
 
 * Clone the git repository: <br>`git clone git://git.qemu.org/qemu.git`
 
-* Join the mailing list: [qemu-devel@nongnu.org](http://lists.nongnu.org/mailman/listinfo/qemu-devel)<br>[See the list of QEMU mailing lists](http://wiki.qemu.org/MailingLists)
+* Join the mailing list: [qemu-devel@nongnu.org](https://lists.nongnu.org/mailman/listinfo/qemu-devel)<br>[See the list of QEMU mailing lists](https://wiki.qemu.org/MailingLists)
 
 * Chat with the developers on IRC: irc.oftc.net, channel #qemu
 
-* Read developer documentation: &ldquo;[Getting started for developers](http://wiki.qemu.org/Documentation/GettingStartedDevelopers)&rdquo;,
-  &ldquo;[Contributor FAQ](http://wiki.qemu.org/Contribute/FAQ)&rdquo;, &ldquo;[How to submit a patch](http://wiki.qemu.org/Contribute/SubmitAPatch)&rdquo;
+* Read developer documentation: &ldquo;[Getting started for developers](https://wiki.qemu.org/Documentation/GettingStartedDevelopers)&rdquo;,
+  &ldquo;[Contributor FAQ](https://wiki.qemu.org/Contribute/FAQ)&rdquo;, &ldquo;[How to submit a patch](https://wiki.qemu.org/Contribute/SubmitAPatch)&rdquo;
diff --git a/contribute/report-a-bug.md b/contribute/report-a-bug.md
index 251fb80..441c61b 100644
--- a/contribute/report-a-bug.md
+++ b/contribute/report-a-bug.md
@@ -15,12 +15,12 @@ When submitting a bug report, please try to do the following:
 
 * Include information about the host and guest (operating system, version, 32/64-bit).
 
-* Do not contribute patches on the bug tracker; send patches to the mailing list. Follow QEMU's [guidelines about submitting patches](http://wiki.qemu.org/Contribute/SubmitAPatch).
+* Do not contribute patches on the bug tracker; send patches to the mailing list. Follow QEMU's [guidelines about submitting patches](https://wiki.qemu.org/Contribute/SubmitAPatch).
 
 Do NOT report security issues (or other bugs, too) as
 "private" bugs in the bug tracker.  QEMU has a [security
-process](http://wiki.qemu.org/SecurityProcess) for issues that should
+process](https://wiki.qemu.org/SecurityProcess) for issues that should
 be reported in a non-public way instead.
 
 For problems with KVM in the kernel, use the kernel bug tracker instead;
-the [KVM wiki](http://www.linux-kvm.org/page/Bugs) has the details.
+the [KVM wiki](https://www.linux-kvm.org/page/Bugs) has the details.
diff --git a/documentation.md b/documentation.md
index 4a63cc3..f4ef9f4 100644
--- a/documentation.md
+++ b/documentation.md
@@ -4,10 +4,10 @@ permalink: /documentation/
 ---
 
 The [QEMU user manual](https://qemu.weilnetz.de/qemu-doc.html) can be read online, courtesy of Stefan Weil.
-More documentation is found in the <a href="http://git.qemu.org/?p=qemu.git;a=tree;f=docs;hb=master">`docs`</a>
+More documentation is found in the <a href="https://git.qemu.org/?p=qemu.git;a=tree;f=docs;hb=master">`docs`</a>
 directory of the QEMU git tree.
 
-The [QEMU wiki](http://wiki.qemu.org) contains more
-[user documentation](http://wiki.qemu.org/Category:User_documentation) and
-[developer documentation](http://wiki.qemu.org/Category:Developer_documentation)
+The [QEMU wiki](https://wiki.qemu.org) contains more
+[user documentation](https://wiki.qemu.org/Category:User_documentation) and
+[developer documentation](https://wiki.qemu.org/Category:Developer_documentation)
 that has not been integrated into the QEMU git tree.
diff --git a/index.html b/index.html
index f4c9c18..37a0fbd 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@ $('.colorbox').on("click.random-namespace", function() {
 
 		</div>
 		<hr>
-		<p>QEMU is a member of <a href="http://wiki.qemu.org/Conservancy">Software Freedom Conservancy</a>.</p>
+		<p>QEMU is a member of <a href="https://wiki.qemu.org/Conservancy">Software Freedom Conservancy</a>.</p>
 	</div>
 </div>
 
-- 
2.13.5

Re: [Qemu-devel] [PATCH web 0/2] Secure the download links and more

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

On 09/04/2017 09:26 AM, Daniel P. Berrange wrote:
> which gives the $BAD guys plenty chance to compromise your
> download. Fix this to link to https:// sites exclusively
> and use the preferred qemu.org domani too. All links are
> fixed to use https, not merely download site links.

We should also patch include/qemu-common.h, which lists http:// rather
than https:// for the --help output (because at the time the patch was
first written, we did not have https:// fully working yet)

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]

Re: [Qemu-devel] [PATCH web 0/2] Secure the download links and more

[Paolo Bonzini]

On 04/09/2017 16:26, Daniel P. Berrange wrote:
> Peter pointed out a bit of a crazy setup:
> 
> The front page link to the 2.10.0 tarball is
> 
>   http://download.qemu-project.org/qemu-2.10.0.tar.xz
> 
> which gets you a 301 redirect to
> 
>   http://download.qemu.org/qemu-2.10.0.tar.xz
> 
> which gets you a 301 redirect to
> 
>   https://download.qemu.org/qemu-2.10.0.tar.xz...
> 
> which gives the $BAD guys plenty chance to compromise your
> download. Fix this to link to https:// sites exclusively
> and use the preferred qemu.org domani too. All links are
> fixed to use https, not merely download site links.
> 
> Daniel P. Berrange (2):
>   Update all links to prefer qemu.org over qemu-project.org
>   Use https links whereever possible
> 
>  .htaccess                                            |  6 +++---
>  _download/source.html                                | 12 ++++++------
>  _includes/footer.html                                | 18 +++++++++---------
>  _includes/releases.html                              |  8 ++++----
>  _posts/2017-02-04-the-new-qemu-website-is-up.md      | 10 +++++-----
>  _posts/2017-03-19-qemu-in-the-blogs-february-2017.md |  4 ++--
>  _posts/2017-08-10-deprecation.md                     |  2 +-
>  contribute.md                                        |  8 ++++----
>  contribute/report-a-bug.md                           |  6 +++---
>  documentation.md                                     |  8 ++++----
>  index.html                                           |  2 +-
>  11 files changed, 42 insertions(+), 42 deletions(-)
> 

Queued, including changes to the 2.10.0 blog post in patch 2.  Will push
tomorrow.

Paolo