From bb50acdcb8073654ea667b8c0272e335bd43f844 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 14 Apr 2022 20:12:14 +0200
Subject: Merging upstream version 1.34.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 packaging/repoconfig/netdata-edge.repo.centos | 2 ++
 packaging/repoconfig/netdata-edge.repo.fedora | 2 ++
 packaging/repoconfig/netdata-edge.repo.ol     | 2 ++
 packaging/repoconfig/netdata-repo.spec        | 4 ++++
 packaging/repoconfig/netdata.repo.centos      | 2 ++
 packaging/repoconfig/netdata.repo.fedora      | 2 ++
 packaging/repoconfig/netdata.repo.ol          | 2 ++
 7 files changed, 16 insertions(+)

(limited to 'packaging/repoconfig')

diff --git a/packaging/repoconfig/netdata-edge.repo.centos b/packaging/repoconfig/netdata-edge.repo.centos
index 124cf612e..af56384f3 100644
--- a/packaging/repoconfig/netdata-edge.repo.centos
+++ b/packaging/repoconfig/netdata-edge.repo.centos
@@ -7,6 +7,7 @@ gpgkey=https://packagecloud.io/netdata/netdata-edge/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
@@ -17,3 +18,4 @@ gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
diff --git a/packaging/repoconfig/netdata-edge.repo.fedora b/packaging/repoconfig/netdata-edge.repo.fedora
index 636fba6e4..902e00c13 100644
--- a/packaging/repoconfig/netdata-edge.repo.fedora
+++ b/packaging/repoconfig/netdata-edge.repo.fedora
@@ -7,6 +7,7 @@ gpgkey=https://packagecloud.io/netdata/netdata-edge/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
@@ -17,3 +18,4 @@ gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
diff --git a/packaging/repoconfig/netdata-edge.repo.ol b/packaging/repoconfig/netdata-edge.repo.ol
index d6da7d356..1d1ea407b 100644
--- a/packaging/repoconfig/netdata-edge.repo.ol
+++ b/packaging/repoconfig/netdata-edge.repo.ol
@@ -7,6 +7,7 @@ gpgkey=https://packagecloud.io/netdata/netdata-edge/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
@@ -17,3 +18,4 @@ gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
diff --git a/packaging/repoconfig/netdata-repo.spec b/packaging/repoconfig/netdata-repo.spec
index eaee0eba5..0a26b97c3 100644
--- a/packaging/repoconfig/netdata-repo.spec
+++ b/packaging/repoconfig/netdata-repo.spec
@@ -19,6 +19,10 @@ Source7:        netdata-edge.repo.ol
 
 BuildArch:      noarch
 
+%if 0%{?centos_ver} && 0%{?centos_ver} < 8
+Requires:       yum-plugin-priorities
+%endif
+
 # Overlapping file installs
 Conflicts:      netdata-repo-edge
 
diff --git a/packaging/repoconfig/netdata.repo.centos b/packaging/repoconfig/netdata.repo.centos
index 1eb2f2616..d9cb2bca8 100644
--- a/packaging/repoconfig/netdata.repo.centos
+++ b/packaging/repoconfig/netdata.repo.centos
@@ -7,6 +7,7 @@ gpgkey=https://packagecloud.io/netdata/netdata/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
@@ -17,3 +18,4 @@ gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
diff --git a/packaging/repoconfig/netdata.repo.fedora b/packaging/repoconfig/netdata.repo.fedora
index 5efb5c73a..82ec6ea57 100644
--- a/packaging/repoconfig/netdata.repo.fedora
+++ b/packaging/repoconfig/netdata.repo.fedora
@@ -7,6 +7,7 @@ gpgkey=https://packagecloud.io/netdata/netdata/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
@@ -17,3 +18,4 @@ gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
diff --git a/packaging/repoconfig/netdata.repo.ol b/packaging/repoconfig/netdata.repo.ol
index 4b3d61997..763504b29 100644
--- a/packaging/repoconfig/netdata.repo.ol
+++ b/packaging/repoconfig/netdata.repo.ol
@@ -7,6 +7,7 @@ gpgkey=https://packagecloud.io/netdata/netdata/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
 
 [netdata-repoconfig]
 name=Netdata Repository Config
@@ -17,3 +18,4 @@ gpgkey=https://packagecloud.io/netdata/netdata-repoconfig/gpgkey
 enabled=1
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+priority=50
-- 
cgit v1.2.3