From bdd6b7a104030a03cc77e5293d5947d970a219e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20N=C3=B6thlich?= Date: Fri, 17 Mar 2023 11:57:45 +0100 Subject: [PATCH] Update repo urls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #278 refs #151 Signed-off-by: Adrian Nöthlich --- data/family/Debian.yaml | 2 +- data/family/RedHat.yaml | 2 +- spec/classes/grafana_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/family/Debian.yaml b/data/family/Debian.yaml index bdea3e41..3fbffc57 100644 --- a/data/family/Debian.yaml +++ b/data/family/Debian.yaml @@ -1,5 +1,5 @@ --- grafana::install_method: 'repo' -grafana::repo_url: 'https://packages.grafana.com/oss/deb' +grafana::repo_url: 'https://apt.grafana.com' grafana::repo_key_id: '0E22EB88E39E12277A7760AE9E439B102CF3C0C6' grafana::sysconfig_location: '/etc/default/grafana-server' diff --git a/data/family/RedHat.yaml b/data/family/RedHat.yaml index 0ada9efc..20f64f24 100644 --- a/data/family/RedHat.yaml +++ b/data/family/RedHat.yaml @@ -1,4 +1,4 @@ --- grafana::install_method: 'repo' -grafana::repo_url: 'https://packages.grafana.com/oss/rpm' +grafana::repo_url: 'https://rpm.grafana.com' grafana::sysconfig_location: '/etc/sysconfig/grafana-server' diff --git a/spec/classes/grafana_spec.rb b/spec/classes/grafana_spec.rb index ef928318..4311b614 100644 --- a/spec/classes/grafana_spec.rb +++ b/spec/classes/grafana_spec.rb @@ -94,7 +94,7 @@ when 'Debian' describe 'install apt repo dependencies first' do it { is_expected.to contain_class('apt') } - it { is_expected.to contain_apt__source('grafana').with(release: 'stable', repos: 'main', location: 'https://packages.grafana.com/oss/deb') } + it { is_expected.to contain_apt__source('grafana').with(release: 'stable', repos: 'main', location: 'https://apt.grafana.com') } it { is_expected.to contain_apt__source('grafana').that_comes_before('Package[grafana]') } end @@ -107,7 +107,7 @@ end when 'RedHat' describe 'yum repo dependencies first' do - it { is_expected.to contain_yumrepo('grafana-stable').with(baseurl: 'https://packages.grafana.com/oss/rpm', gpgkey: 'https://packages.grafana.com/gpg.key', enabled: 1) } + it { is_expected.to contain_yumrepo('grafana-stable').with(baseurl: 'https://rpm.grafana.com', gpgkey: 'https://packages.grafana.com/gpg.key', enabled: 1) } it { is_expected.to contain_yumrepo('grafana-stable').that_comes_before('Package[grafana]') } end