Libguestfs - Dec 2018 - [PATCH 1/2] builder: Fix redirect in virt-builder configuration.

For a while libguestfs.org/builder has redirected to
builder.libguestfs.org.  This change just makes virt-builder go direct
to the subsite instead of via the redirect.
---
 builder/libguestfs.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/libguestfs.conf.in b/builder/libguestfs.conf.in
index 633a0abaf..3b9e3854f 100644
--- a/builder/libguestfs.conf.in
+++ b/builder/libguestfs.conf.in
@@ -1,3 +1,3 @@
 [libguestfs.org]
-uri=http://libguestfs.org/download/builder/index.asc
+uri=http://builder.libguestfs.org/index.asc
 gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/libguestfs.gpg
-- 
2.19.0.rc0

builder.libguestfs.org has almost run out of space.  I would like to
move templates for older guests to the archive site (which is slower
but has unlimited space).  The easiest way to do this is to add a
second repo.

This only affects obsolete/unsupported Fedora releases.
---
 builder/libguestfs.conf.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/builder/libguestfs.conf.in b/builder/libguestfs.conf.in
index 3b9e3854f..412079df6 100644
--- a/builder/libguestfs.conf.in
+++ b/builder/libguestfs.conf.in
@@ -1,3 +1,7 @@
 [libguestfs.org]
 uri=http://builder.libguestfs.org/index.asc
 gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/libguestfs.gpg
+
+[archive.libguestfs.org]
+uri=http://archive.libguestfs.org/builder/index.asc
+gpgkey=file://@SYSCONFDIR@/xdg/virt-builder/repos.d/libguestfs.gpg
-- 
2.19.0.rc0

On Thursday, 6 December 2018 15:55:09 CET Richard W.M. Jones
wrote:
> For a while libguestfs.org/builder has redirected to
> builder.libguestfs.org.  This change just makes virt-builder go direct
> to the subsite instead of via the redirect.
> ---
Both patches LGTM -- can you please amend
builder/test-website/virt-builder/repos.d/libguestfs.conf.in
as well?

Thanks,
-- 
Pino Toscano

On Thu, Dec 06, 2018 at 06:54:44PM +0100, Pino Toscano
wrote:
> On Thursday, 6 December 2018 15:55:09 CET Richard W.M. Jones wrote:
> > For a while libguestfs.org/builder has redirected to
> > builder.libguestfs.org.  This change just makes virt-builder go direct
> > to the subsite instead of via the redirect.
> > ---
> 
> Both patches LGTM -- can you please amend
> builder/test-website/virt-builder/repos.d/libguestfs.conf.in
> as well?
Does that need to be changed?  There's actually some complication
which I discovered yesterday related to that file which I didn't fix yet:

Currently we build website/download/builder/index{,.asc} from the
*.index-fragment files.

However with the split of archived images / current images, we now
need to build two sets of index files.  That means two sets of
website/download/... directories, and then changing
builder/test-website/virt-builder/repos.d/libguestfs.conf.in to point
to both.

I punted on this for now, although it does have to be fixed
eventually, because I really need to upload new files to our over-full
server.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v