Merging upstream version 1.38.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 77 insertions, 64 deletions

diff --git a/packaging/repoconfig/Makefile b/packaging/repoconfig/Makefile
index d0f246ac..18b9887f 100644
--- a/packaging/repoconfig/Makefile
+++ b/packaging/repoconfig/Makefile
@@ -4,23 +4,26 @@ all: $(FILES)
 
 netdata.list: netdata.list.in
 	cp netdata.list.in netdata.list
-	set -a && . /etc/os-release && sed -i -e "s/__DISTRO__/$${ID}/" -e "s/__SUITE__/$${VERSION_CODENAME}/" -e "s/__VARIANT__//" netdata.list
+	set -a && . /etc/os-release && sed -i -e "s/__DISTRO__/$${ID}/" -e "s/__SUITE__/$${VERSION_CODENAME}/" -e "s/__VARIANT__/stable/" netdata.list
 
 netdata-edge.list: netdata.list.in
 	cp netdata.list.in netdata-edge.list
-	set -a && . /etc/os-release && sed -i -e "s/__DISTRO__/$${ID}/" -e "s/__SUITE__/$${VERSION_CODENAME}/" -e "s/__VARIANT__/-edge/" netdata-edge.list
+	set -a && . /etc/os-release && sed -i -e "s/__DISTRO__/$${ID}/" -e "s/__SUITE__/$${VERSION_CODENAME}/" -e "s/__VARIANT__/edge/" netdata-edge.list
 
-netdata-archive-keyring.gpg:
-	curl -L https://packagecloud.io/netdata/netdata/gpgkey | gpg --dearmor > netdata-archive-keyring.gpg
+netdata.gpg.key:
+	curl -L https://repo.netdata.cloud/netdatabot.gpg.key > $@
 
-netdata-edge-archive-keyring.gpg:
-	curl -L https://packagecloud.io/netdata/netdata-edge/gpgkey | gpg --dearmor > netdata-edge-archive-keyring.gpg
+netdata-archive-keyring.gpg: netdata.gpg.key
+	gpg --dearmor > $@ < $<
 
-netdata-repoconfig-archive-keyring.gpg:
-	curl -L https://packagecloud.io/netdata/netdata-repoconfig/gpgkey | gpg --dearmor > netdata-repoconfig-archive-keyring.gpg
+netdata-edge-archive-keyring.gpg: netdata.gpg.key
+	gpg --dearmor > $@ < $<
+
+netdata-repoconfig-archive-keyring.gpg: netdata.gpg.key
+	gpg --dearmor > $@ < $<
 
 debian/tmp:
-	mkdir -p debian/tmp
+	mkdir -p $@
 
 install: $(FILES) debian/tmp
 	cp $(FILES) debian/tmp/
@@ -29,3 +32,4 @@ clean:
 	rm -f $(FILES)
 
 .PHONY: clean
+.INTERMEDIATE: netdatabot.gpg.key
diff --git a/packaging/repoconfig/debian/changelog b/packaging/repoconfig/debian/changelog
index 57c12d71..02eedfc3 100644
--- a/packaging/repoconfig/debian/changelog
+++ b/packaging/repoconfig/debian/changelog
@@ -1,3 +1,10 @@
+netdata-repo (2-1) unstable; urgency=medium
+
+  * Switched to new package hosting infrastructure
+  * Removed apt-transport-https requirement
+
+ -- Netdata Builder <bot@netdata.cloud>  Wed, 18 Jan 2023 08:30:00 -0500
+
 netdata-repo (1-2) unstable; urgency=medium
 
   * Fixed package file naming for repo layout compliance
diff --git a/packaging/repoconfig/debian/control b/packaging/repoconfig/debian/control
index 5fdcf140..fdea6a82 100644
--- a/packaging/repoconfig/debian/control
+++ b/packaging/repoconfig/debian/control
@@ -8,12 +8,12 @@ Homepage: https://netdata.cloud
 
 Package: netdata-repo
 Architecture: all
-Depends: apt-transport-https, debian-archive-keyring, gnupg
+Depends: debian-archive-keyring, gnupg
 Conflicts: netdata-repo-edge
 Description: Configuration for the official Netdata Stable package repository.
 
 Package: netdata-repo-edge
 Architecture:all
-Depends: apt-transport-https, debian-archive-keyring, gnupg
+Depends: debian-archive-keyring, gnupg
 Conflicts: netdata-repo
 Description: Configuration for the official Netdata Edge package repository.
diff --git a/packaging/repoconfig/debian/copyright b/packaging/repoconfig/debian/copyright
index 193b45e6..44b59693 100644
--- a/packaging/repoconfig/debian/copyright
+++ b/packaging/repoconfig/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Costa Tsaousis <costa@netdata.cloud>
 Source: https://github.com/netdata/netdata
 
 Files: *
-Copyright: 2021 Netdata Inc.
+Copyright: 2021-2023 Netdata Inc.
 License: GPL-3+
  On Debian systems, the complete text of the GNU General Public
  License version 3 can be found in /usr/share/common-licenses/GPL-3.
diff --git a/packaging/repoconfig/netdata-edge.repo.centos b/packaging/repoconfig/netdata-edge.repo.centos
index af56384f..fd96f0d7 100644
--- a/packaging/repoconfig/netdata-edge.repo.centos
+++ b/packaging/repoconfig/netdata-edge.repo.centos
@@ -1,9 +1,9 @@
 [netdata-edge]
 name=Netdata Edge
-baseurl=https://packagecloud.io/netdata/netdata-edge/el/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/edge/el/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-edge/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
@@ -11,10 +11,10 @@ priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/el/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/el/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/packaging/repoconfig/netdata-edge.repo.fedora b/packaging/repoconfig/netdata-edge.repo.fedora
index 902e00c1..03b0e9c7 100644
--- a/packaging/repoconfig/netdata-edge.repo.fedora
+++ b/packaging/repoconfig/netdata-edge.repo.fedora
@@ -1,9 +1,9 @@
 [netdata-edge]
 name=Netdata Edge
-baseurl=https://packagecloud.io/netdata/netdata-edge/fedora/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/edge/fedora/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-edge/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
@@ -11,10 +11,10 @@ priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/fedora/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/fedora/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/packaging/repoconfig/netdata-edge.repo.ol b/packaging/repoconfig/netdata-edge.repo.ol
index 1d1ea407..89f74e71 100644
--- a/packaging/repoconfig/netdata-edge.repo.ol
+++ b/packaging/repoconfig/netdata-edge.repo.ol
@@ -1,9 +1,9 @@
 [netdata-edge]
 name=Netdata Edge
-baseurl=https://packagecloud.io/netdata/netdata-edge/ol/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/edge/ol/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-edge/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
@@ -11,10 +11,10 @@ priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/ol/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/ol/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/packaging/repoconfig/netdata-edge.repo.suse b/packaging/repoconfig/netdata-edge.repo.suse
index 94db12a5..f65bd08d 100644
--- a/packaging/repoconfig/netdata-edge.repo.suse
+++ b/packaging/repoconfig/netdata-edge.repo.suse
@@ -1,19 +1,19 @@
 [netdata-edge]
 name=Netdata Edge
-baseurl=https://packagecloud.io/netdata/netdata-edge/opensuse/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/edge/opensuse/$releasever/$basearch
 repo_gpgcheck=1
-pkg_gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-edge/gpgkey
+pkg_gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 type=rpm-md
 autorefresh=1
 
 [netdata-repoconfig]
 name=Netdata Repoconfig
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/opensuse/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/opensuse/$releasever/$basearch
 repo_gpgcheck=1
-pkg_gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+pkg_gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 type=rpm-md
 autorefresh=1
diff --git a/packaging/repoconfig/netdata-repo.spec b/packaging/repoconfig/netdata-repo.spec
index 3e5f66b8..cc53fd8c 100644
--- a/packaging/repoconfig/netdata-repo.spec
+++ b/packaging/repoconfig/netdata-repo.spec
@@ -1,8 +1,8 @@
 %{?rhel:%global centos_ver %rhel}
 
 Name:           netdata-repo
-Version:        1
-Release:        2
+Version:        2
+Release:        1
 Summary:        Netdata stable repositories configuration.
 
 Group:          System Environment/Base
@@ -96,6 +96,8 @@ This package contains the official Netdata package repository configuration for
 %endif
 
 %changelog
+* Wed Dec 7 2022 Austin Hemmelgarn <austin@netdata.cloud> 2-1
+- Switch to new hosting at repo.netdata.cloud.
 * Mon Jun 6 2022 Austin Hemmelgarn <austin@netdata.cloud> 1-2
 - Bump release to keep in sync with DEB package.
 * Mon Jun 14 2021 Austin Hemmelgarn <austin@netdata.cloud> 1-1
diff --git a/packaging/repoconfig/netdata.list.in b/packaging/repoconfig/netdata.list.in
index 9c3ddba0..a49dbd91 100644
--- a/packaging/repoconfig/netdata.list.in
+++ b/packaging/repoconfig/netdata.list.in
@@ -1,2 +1,2 @@
-deb https://packagecloud.io/netdata/netdata__VARIANT__/__DISTRO__/ __SUITE__ main
-deb https://packagecloud.io/netdata/netdata-repoconfig/__DISTRO__/ __SUITE__ main
+deb http://repo.netdata.cloud/repos/__VARIANT__/__DISTRO__/ __SUITE__/
+deb http://repo.netdata.cloud/repos/repoconfig/__DISTRO__/ __SUITE__/
diff --git a/packaging/repoconfig/netdata.repo.centos b/packaging/repoconfig/netdata.repo.centos
index d9cb2bca..221e6451 100644
--- a/packaging/repoconfig/netdata.repo.centos
+++ b/packaging/repoconfig/netdata.repo.centos
@@ -1,9 +1,9 @@
 [netdata]
 name=Netdata
-baseurl=https://packagecloud.io/netdata/netdata/el/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/stable/el/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
@@ -11,10 +11,10 @@ priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/el/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/el/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/packaging/repoconfig/netdata.repo.fedora b/packaging/repoconfig/netdata.repo.fedora
index 82ec6ea5..e13262ac 100644
--- a/packaging/repoconfig/netdata.repo.fedora
+++ b/packaging/repoconfig/netdata.repo.fedora
@@ -1,9 +1,9 @@
 [netdata]
 name=Netdata
-baseurl=https://packagecloud.io/netdata/netdata/fedora/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/stable/fedora/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
@@ -11,10 +11,10 @@ priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/fedora/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/fedora/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/packaging/repoconfig/netdata.repo.ol b/packaging/repoconfig/netdata.repo.ol
index 763504b2..0488670d 100644
--- a/packaging/repoconfig/netdata.repo.ol
+++ b/packaging/repoconfig/netdata.repo.ol
@@ -1,9 +1,9 @@
 [netdata]
 name=Netdata
-baseurl=https://packagecloud.io/netdata/netdata/ol/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/stable/ol/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
@@ -11,10 +11,10 @@ priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/ol/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/ol/$releasever/$basearch
 repo_gpgcheck=1
-gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/packaging/repoconfig/netdata.repo.suse b/packaging/repoconfig/netdata.repo.suse
index 55ad73e3..8204d8d4 100644
--- a/packaging/repoconfig/netdata.repo.suse
+++ b/packaging/repoconfig/netdata.repo.suse
@@ -1,19 +1,19 @@
 [netdata]
 name=Netdata
-baseurl=https://packagecloud.io/netdata/netdata/opensuse/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/stable/opensuse/$releasever/$basearch
 repo_gpgcheck=1
-pkg_gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata/gpgkey
+pkg_gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 type=rpm-md
 autorefresh=1
 
 [netdata-repoconfig]
 name=Netdata Repoconfig
-baseurl=https://packagecloud.io/netdata/netdata-repoconfig/opensuse/$releasever/$basearch
+baseurl=https://repo.netdata.cloud/repos/repoconfig/opensuse/$releasever/$basearch
 repo_gpgcheck=1
-pkg_gpgcheck=0
-gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
+pkg_gpgcheck=1
+gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 type=rpm-md
 autorefresh=1