Use the new CDN for metadata

0001-Use-a-CNAME-to-redirect-to-the-correct-CDN-for-metad.patch

@@ -1,16 +1,20 @@
-From c1832f4a74177c39f3362b255d9d7127d02813f7 Mon Sep 17 00:00:00 2001
+From 4ee0836ff3f3c5ee14965da250bc549abcbcc95c Mon Sep 17 00:00:00 2001
 From: Richard Hughes <richard@hughsie.com>
-Date: Thu, 25 Jan 2018 13:52:02 +0000
+Date: Wed, 21 Feb 2018 19:01:57 +0000
-Subject: [PATCH] Do not use the CDN when getting metadata
+Subject: [PATCH] Use a CNAME to redirect to the correct CDN for metadata
 
-We have a new server that can hopefully cope with the load.
+The current CDN (~$100/month) is kindly sponsored by Amazon, but that won't
+last forever. In the future we can switch to a 'dumb' provider like BunnyCDN
+for 1/10th of the cost.
+
+Use a CNAME we control to make switching CDN providers easy in the future.
 ---
  data/remotes.d/lvfs-testing.conf | 2 +-
  data/remotes.d/lvfs.conf         | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/data/remotes.d/lvfs-testing.conf b/data/remotes.d/lvfs-testing.conf
-index 75da08f1..dc4133a5 100644
+index 75da08f1..41d9ffff 100644
 --- a/data/remotes.d/lvfs-testing.conf
 +++ b/data/remotes.d/lvfs-testing.conf
 @@ -4,7 +4,7 @@
@@ -18,12 +22,12 @@ index 75da08f1..dc4133a5 100644
  Title=Linux Vendor Firmware Service (testing)
  Keyring=gpg
 -MetadataURI=https://s3.amazonaws.com/lvfsbucket/downloads/firmware-testing.xml.gz
-+MetadataURI=https://fwupd.org/downloads/firmware-testing.xml.gz
++MetadataURI=https://cdn.fwupd.org/downloads/firmware-testing.xml.gz
  ReportURI=https://fwupd.org/lvfs/firmware/report
  Username=
  Password=
 diff --git a/data/remotes.d/lvfs.conf b/data/remotes.d/lvfs.conf
-index 51d0f55e..b7dea262 100644
+index 51d0f55e..4e971be6 100644
 --- a/data/remotes.d/lvfs.conf
 +++ b/data/remotes.d/lvfs.conf
 @@ -4,6 +4,6 @@
@@ -31,7 +35,7 @@ index 51d0f55e..b7dea262 100644
  Title=Linux Vendor Firmware Service
  Keyring=gpg
 -MetadataURI=https://s3.amazonaws.com/lvfsbucket/downloads/firmware.xml.gz
-+MetadataURI=https://fwupd.org/downloads/firmware.xml.gz
++MetadataURI=https://cdn.fwupd.org/downloads/firmware.xml.gz
  ReportURI=https://fwupd.org/lvfs/firmware/report
  OrderBefore=fwupd
 -- 

fwupd.spec

@@ -25,13 +25,13 @@
 Summary:   Firmware update daemon
 Name:      fwupd
 Version:   1.0.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 URL:       https://github.com/hughsie/fwupd
 Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
 
-# lets test this with rawhide and see how the server copes
+# backport from master
-Patch0:    0001-Do-not-use-the-CDN-when-getting-metadata.patch
+Patch0:    0001-Use-a-CNAME-to-redirect-to-the-correct-CDN-for-metad.patch
 
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -271,6 +271,9 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
 %{_datadir}/installed-tests/fwupd/*.py*
 
 %changelog
+* Fri Feb 23 2018 Richard Hughes <richard@hughsie.com> 1.0.5-2
+- Use the new CDN for metadata.
+
 * Wed Feb 14 2018 Richard Hughes <richard@hughsie.com> 1.0.5-1
 - New upstream release
 - Be more careful deleting and modifying device history