diff --git a/manifests/repo/yum_postgresql_org.pp b/manifests/repo/yum_postgresql_org.pp index 5cfaf4b..2f67104 100644 --- a/manifests/repo/yum_postgresql_org.pp +++ b/manifests/repo/yum_postgresql_org.pp @@ -1,30 +1,30 @@ # PRIVATE CLASS: do not use directly class postgresql::repo::yum_postgresql_org inherits postgresql::repo { $version_parts = split($postgresql::repo::version, '[.]') $package_version = "${version_parts[0]}${version_parts[1]}" $gpg_key_path = "/etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}" file { $gpg_key_path: source => 'puppet:///modules/postgresql/RPM-GPG-KEY-PGDG', before => Yumrepo['yum.postgresql.org'] } if($::operatingsystem == 'Fedora') { $label1 = 'fedora' $label2 = $label1 } else { $label1 = 'redhat' $label2 = 'rhel' } yumrepo { 'yum.postgresql.org': descr => "PostgreSQL ${postgresql::repo::version} \$releasever - \$basearch", - baseurl => "http://yum.postgresql.org/${postgresql::repo::version}/${label1}/${label2}-\$releasever-\$basearch", + baseurl => "https://download.postgresql.org/pub/repos/yum/${postgresql::repo::version}/${label1}/${label2}-\$releasever-\$basearch", enabled => 1, gpgcheck => 1, gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-PGDG-${package_version}", proxy => $postgresql::repo::proxy, } Yumrepo['yum.postgresql.org'] -> Package<|tag == 'postgresql'|> } diff --git a/spec/unit/classes/globals_spec.rb b/spec/unit/classes/globals_spec.rb index ce79336..8dff05e 100644 --- a/spec/unit/classes/globals_spec.rb +++ b/spec/unit/classes/globals_spec.rb @@ -1,67 +1,67 @@ require 'spec_helper' describe 'postgresql::globals', :type => :class do context "on a debian 6" do let (:facts) do { :osfamily => 'Debian', :operatingsystem => 'Debian', :operatingsystemrelease => '6.0', :lsbdistid => 'Debian', :lsbdistcodename => 'squeeze', } end describe 'with no parameters' do it 'should work' do is_expected.to contain_class("postgresql::globals") end end describe 'manage_package_repo => true' do let(:params) do { :manage_package_repo => true, } end it 'should pull in class postgresql::repo' do is_expected.to contain_class("postgresql::repo") end end end context 'on redhat family systems' do let (:facts) do { :osfamily => 'RedHat', :operatingsystem => 'RedHat', :operatingsystemrelease => '7.1', } end describe 'with no parameters' do it 'should work' do is_expected.to contain_class("postgresql::globals") end end - + describe 'manage_package_repo on RHEL => true' do let(:params) do { :manage_package_repo => true, :repo_proxy => 'http://proxy-server:8080', } end - + it 'should pull in class postgresql::repo' do is_expected.to contain_class("postgresql::repo") end it do should contain_yumrepo('yum.postgresql.org').with( 'enabled' => '1', 'proxy' => 'http://proxy-server:8080' ) end end end end