diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-04-14 18:12:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-04-14 18:12:14 +0000 |
commit | bb50acdcb8073654ea667b8c0272e335bd43f844 (patch) | |
tree | 1e00c8a29871426f8182658928dcb62e42d57ce8 /packaging/repoconfig | |
parent | Releasing debian version 1.33.1-1. (diff) | |
download | netdata-bb50acdcb8073654ea667b8c0272e335bd43f844.tar.xz netdata-bb50acdcb8073654ea667b8c0272e335bd43f844.zip |
Merging upstream version 1.34.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/repoconfig')
-rw-r--r-- | packaging/repoconfig/netdata-edge.repo.centos | 2 | ||||
-rw-r--r-- | packaging/repoconfig/netdata-edge.repo.fedora | 2 | ||||
-rw-r--r-- | packaging/repoconfig/netdata-edge.repo.ol | 2 | ||||
-rw-r--r-- | packaging/repoconfig/netdata-repo.spec | 4 | ||||
-rw-r--r-- | packaging/repoconfig/netdata.repo.centos | 2 | ||||
-rw-r--r-- | packaging/repoconfig/netdata.repo.fedora | 2 | ||||
-rw-r--r-- | packaging/repoconfig/netdata.repo.ol | 2 |
7 files changed, 16 insertions, 0 deletions
diff --git a/packaging/repoconfig/netdata-edge.repo.centos b/packaging/repoconfig/netdata-edge.repo.centos index 124cf612..af56384f 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 636fba6e..902e00c1 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 d6da7d35..1d1ea407 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 eaee0eba..0a26b97c 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 1eb2f261..d9cb2bca 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 5efb5c73..82ec6ea5 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 4b3d6199..763504b2 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 |