From 4fead684b8e11643c3a606380e31902abcaf5edc Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 7 Sep 2018 20:03:46 -0500 Subject: [PATCH] repo: Adjust repos to be more sane [master] * Set url (identifier) as generic hpkg.haiku-os.org url * Set base-url (actual repo location) as eu.hpkg.haiku-os.org (our eu mirror) * Drop old "repository" url mess I had a realization that haikudepot operates off of the base-url, if we continue using old url's after r1beta1, we're going to be stuck with all the symlinks and redirects for a looooong time. This also opens the chance for us to go off of the generic "url" for haikudepot identification, which will let it work when users leverage mirrors. Change-Id: Ic8fa954190cc26602911e133dd3c25ce2a96ce9d --- src/data/repository_infos/haiku | 4 ++-- src/data/repository_infos/haikuports | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/repository_infos/haiku b/src/data/repository_infos/haiku index 7f2e5a165e..359dd84db8 100644 --- a/src/data/repository_infos/haiku +++ b/src/data/repository_infos/haiku @@ -2,6 +2,6 @@ name Haiku vendor "Haiku Project" summary "The Haiku repository (for Haiku %HAIKU_VERSION_NO_REVISION%)" priority 1 -baseurl https://download.haiku-os.org/haiku-repositories/master/%HAIKU_PACKAGING_ARCH%/current -url https://download.haiku-os.org/haiku-repositories/master/%HAIKU_PACKAGING_ARCH%/current +baseurl https://eu.hpkg.haiku-os.org/haiku/master/%HAIKU_PACKAGING_ARCH%/current +url https://hpkg.haiku-os.org/haiku/master/%HAIKU_PACKAGING_ARCH%/current architecture %HAIKU_PACKAGING_ARCH% diff --git a/src/data/repository_infos/haikuports b/src/data/repository_infos/haikuports index 7e6ddc0ed4..22f3335f61 100644 --- a/src/data/repository_infos/haikuports +++ b/src/data/repository_infos/haikuports @@ -2,6 +2,6 @@ name HaikuPorts vendor "Haiku Project" summary "The HaikuPorts repository (for Haiku %HAIKU_VERSION_NO_REVISION%)" priority 1 -baseurl https://eu.hpkg.haiku-os.org/haikuports/master/repository/%HAIKU_PACKAGING_ARCH%/current -url https://eu.hpkg.haiku-os.org/haikuports/master/repository/%HAIKU_PACKAGING_ARCH%/current +baseurl https://eu.hpkg.haiku-os.org/haikuports/master/%HAIKU_PACKAGING_ARCH%/current +url https://hpkg.haiku-os.org/haikuports/master/%HAIKU_PACKAGING_ARCH%/current architecture %HAIKU_PACKAGING_ARCH%