ipfire-release: Update repository configuration

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/ipfire-release/ipfire-release.nm b/ipfire-release/ipfire-release.nm
index a04effdcfc9e878703b9d80bbe97088564270696..46abfcc053cdcd3957f3af016df5f748cbe0c4e3 100644 (file)
--- a/ipfire-release/ipfire-release.nm
+++ b/ipfire-release/ipfire-release.nm
@@ -14,16 +14,16 @@ DISTRO_COLOR    = 0;31
 
 name       = %{DISTRO_SNAME}-release
 version    = %{DISTRO_VERSION}
-release    = 7
+release    = 8
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Base Build System/Base
 url        = https://www.ipfire.org
 license    =
-summary    = %{DISTRO_NAME} release files.
+summary    = %{DISTRO_NAME} release files
 
 description
-       %{DISTRO_NAME} release files such as pakfire configs and various /etc/ \
+       %{DISTRO_NAME} release files such as pakfire configs and various /etc/
        files that define the release.
 end
 

diff --git a/ipfire-release/repos/stable.repo b/ipfire-release/repos/stable.repo
index d8f86fc6af3e47cf6c80811258464a81e4e743d9..0648a0f5509fc061eb7b32a6e40067f1d434ea6a 100644 (file)
--- a/ipfire-release/repos/stable.repo
+++ b/ipfire-release/repos/stable.repo
@@ -1,5 +1,8 @@
 [repo:stable]
-description = IPFire 3 - Stable repository.
-enabled = 1
-baseurl = http://pakfire.ipfire.org/repositories/ipfire3/stable/%{arch}
-mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/stable/mirrorlist?arch=%{arch}
+description = IPFire 3 - stable
+baseurl = https://pakfire.ipfire.org/files/repos/ipfire-3/stable/%{arch}
+key = untrusted comment: IPFire 3 - stable
+       RWTbyeq8zRxmh8VJCRaXtnSlHCKp+tk7+wjNGpJ53jkP5Dz8j8GWxxOt
+priority = 1000
+refresh = 6h
+mirrors = https://pakfire.ipfire.org/distros/ipfire-3/repos/stable/mirrorlist?arch=%{arch}

diff --git a/ipfire-release/repos/testing.repo b/ipfire-release/repos/testing.repo
index a1bbb26ea564aa78be6217cf07f6ef34c31f72e2..1d8c678e41e4104f7d546b036e044abec54883db 100644 (file)
--- a/ipfire-release/repos/testing.repo
+++ b/ipfire-release/repos/testing.repo
@@ -1,5 +1,7 @@
 [repo:testing]
-description = IPFire 3 - This is a repository for testing stuff.
-enabled = 0
-baseurl = http://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch}
-mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{arch}
+description = IPFire 3 - testing
+baseurl = https://pakfire.ipfire.org/files/repos/ipfire-3/testing/%{arch}
+key = untrusted comment: IPFire 3 - testing
+       RWRe8hKvJ0Kw4cpDHpmW7eMQ/i5rAYQnOHiqBcYgBGjTrkbrwneCbM7X
+priority = 500
+refresh = 10m

diff --git a/ipfire-release/repos/unstable.repo b/ipfire-release/repos/unstable.repo
deleted file mode 100644 (file)
index ce10590..0000000
--- a/ipfire-release/repos/unstable.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[repo:unstable]
-description = IPFire 3 - Public unstable repository.
-enabled = 1
-baseurl = http://pakfire.ipfire.org/repositories/ipfire3/unstable/%{arch}
-mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/unstable/mirrorlist?arch=%{arch}