commit
06bce848b0
3 changed files with 28 additions and 22 deletions
|
@ -1,10 +1,10 @@
|
|||
#if you need to specify a release
|
||||
$rel_string = "-t ${release}"
|
||||
$rel_string = '-t <release>'
|
||||
#else
|
||||
$rel_string = ''
|
||||
|
||||
#if you need to specify a version
|
||||
$ensure = $version
|
||||
$ensure = '<version>'
|
||||
#else
|
||||
$ensure = installed
|
||||
|
||||
|
@ -24,5 +24,5 @@ $config_missing = ''
|
|||
|
||||
package { $package:
|
||||
ensure => $ensure,
|
||||
install_options => "${config_files} ${config_missing} ${release_string}",
|
||||
install_options => "${config_files} ${config_missing} ${rel_string}",
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Declare Apt key for apt.puppetlabs.com source
|
||||
apt::key { 'puppetlabs':
|
||||
key => '4BD6EC30',
|
||||
key_server => 'pgp.mit.edu',
|
||||
key_options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
|
||||
id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
|
||||
server => 'pgp.mit.edu',
|
||||
options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"',
|
||||
}
|
||||
|
|
|
@ -4,26 +4,32 @@ class { 'apt': }
|
|||
# Install the puppetlabs apt source
|
||||
# Release is automatically obtained from lsbdistcodename fact if available.
|
||||
apt::source { 'puppetlabs':
|
||||
location => 'http://apt.puppetlabs.com',
|
||||
repos => 'main',
|
||||
key => '4BD6EC30',
|
||||
key_server => 'pgp.mit.edu',
|
||||
location => 'http://apt.puppetlabs.com',
|
||||
repos => 'main',
|
||||
key => {
|
||||
id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
|
||||
server => 'pgp.mit.edu',
|
||||
},
|
||||
}
|
||||
|
||||
# test two sources with the same key
|
||||
apt::source { 'debian_testing':
|
||||
location => 'http://debian.mirror.iweb.ca/debian/',
|
||||
release => 'testing',
|
||||
repos => 'main contrib non-free',
|
||||
key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
|
||||
key_server => 'subkeys.pgp.net',
|
||||
pin => '-10',
|
||||
location => 'http://debian.mirror.iweb.ca/debian/',
|
||||
release => 'testing',
|
||||
repos => 'main contrib non-free',
|
||||
key => {
|
||||
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
|
||||
server => 'subkeys.pgp.net',
|
||||
},
|
||||
pin => '-10',
|
||||
}
|
||||
apt::source { 'debian_unstable':
|
||||
location => 'http://debian.mirror.iweb.ca/debian/',
|
||||
release => 'unstable',
|
||||
repos => 'main contrib non-free',
|
||||
key => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
|
||||
key_server => 'subkeys.pgp.net',
|
||||
pin => '-10',
|
||||
location => 'http://debian.mirror.iweb.ca/debian/',
|
||||
release => 'unstable',
|
||||
repos => 'main contrib non-free',
|
||||
key => {
|
||||
id => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
|
||||
server => 'subkeys.pgp.net',
|
||||
},
|
||||
pin => '-10',
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue