diff --git a/manifests/params.pp b/manifests/params.pp index 9b610aa..c9bc168 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -11,8 +11,8 @@ $key_signature = '434975BD900CCBE4F7EE1B1ED208507CA14F4FCA' $package_name = 'erlang-nox' $local_repo_location = undef - $remote_repo_key_location = 'http://packages.erlang-solutions.com/debian/erlang_solutions.asc' - $remote_repo_location = 'http://packages.erlang-solutions.com/debian' + $remote_repo_key_location = 'https://packages.erlang-solutions.com/debian/erlang_solutions.asc' + $remote_repo_location = 'https://packages.erlang-solutions.com/debian' $repos = 'contrib' } 'RedHat', 'SUSE', 'Archlinux' : { diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp index dc5dbc9..a6ffc31 100644 --- a/manifests/repo/apt.pp +++ b/manifests/repo/apt.pp @@ -31,11 +31,15 @@ Class['erlang::repo::apt'] -> Package<| title == $package_name |> apt::source { 'erlang': - include_src => false, - key => $key_signature, - key_source => $remote_repo_key_location, - location => $remote_repo_location, - repos => $repos, + include => { + 'src' => false, + }, + key => { + 'id' => $key_signature, + 'source' => $remote_repo_key_location, + }, + location => $remote_repo_location, + repos => $repos, } } diff --git a/spec/classes/erlang_spec.rb b/spec/classes/erlang_spec.rb index 3a17738..92341f0 100644 --- a/spec/classes/erlang_spec.rb +++ b/spec/classes/erlang_spec.rb @@ -14,8 +14,10 @@ it { should compile.with_all_deps } it { should contain_package('erlang-nox').with_ensure('present') } it { should contain_apt__source('erlang').with( - 'key_source' => 'http://packages.erlang-solutions.com/debian/erlang_solutions.asc', - 'key' => '434975BD900CCBE4F7EE1B1ED208507CA14F4FCA' + 'key' => { + 'id' => '434975BD900CCBE4F7EE1B1ED208507CA14F4FCA', + 'source' => 'http://packages.erlang-solutions.com/debian/erlang_solutions.asc', + } ) } end @@ -37,10 +39,12 @@ 'remote_repo_key_location' => 'http://example.com/debian/key.asc', } } it { should contain_apt__source('erlang').with( - 'location' => 'http://example.com/debian', - 'key_source' => 'http://example.com/debian/key.asc', - 'key' => '1234ABCD', - 'repos' => 'main' + 'location' => 'http://example.com/debian', + 'key' => { + 'id' => '1234ABCD', + 'source' => 'http://example.com/debian/key.asc', + }, + 'repos' => 'main' ) } end