Skip to content

Commit

Permalink
Update repo urls
Browse files Browse the repository at this point in the history
fixes voxpupuli#278
refs voxpupuli#151

Signed-off-by: Adrian Nöthlich <adrian.noethlich@hadiko.de>
  • Loading branch information
promasu committed Mar 17, 2023
1 parent 57a6cdc commit 407ba8c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 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'
2 changes: 1 addition & 1 deletion 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'
4 changes: 2 additions & 2 deletions spec/classes/grafana_spec.rb
Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit 407ba8c

Please sign in to comment.