Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
(IAC-365) updating tokens and dataset for honeycomb
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
params.pp
diff --git
a/manifests/params.pp
b/manifests/params.pp
index 52b9bca3fcaa231c6f9a4ab997df448cd7a1e9e9..b0c367ca109cb4858df14ee0fbcdc56263d19332 100644
(file)
--- a/
manifests/params.pp
+++ b/
manifests/params.pp
@@
-16,7
+16,9
@@
class apt::params {
$conf_d = "${root}/apt.conf.d"
$preferences = "${root}/preferences"
$preferences_d = "${root}/preferences.d"
$conf_d = "${root}/apt.conf.d"
$preferences = "${root}/preferences"
$preferences_d = "${root}/preferences.d"
+ $apt_conf_d = "${root}/apt.conf.d"
$keyserver = 'keyserver.ubuntu.com'
$keyserver = 'keyserver.ubuntu.com'
+ $key_options = undef
$confs = {}
$update = {}
$purge = {}
$confs = {}
$update = {}
$purge = {}
@@
-64,6
+66,7
@@
class apt::params {
'sources.list.d' => false,
'preferences' => false,
'preferences.d' => false,
'sources.list.d' => false,
'preferences' => false,
'preferences.d' => false,
+ 'apt.conf.d' => false,
}
$source_key_defaults = {
}
$source_key_defaults = {
@@
-82,11
+85,15
@@
class apt::params {
'Debian': {
$backports = {
'location' => 'http://deb.debian.org/debian',
'Debian': {
$backports = {
'location' => 'http://deb.debian.org/debian',
- 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
'repos' => 'main contrib non-free',
}
$ppa_options = undef
$ppa_package = undef
'repos' => 'main contrib non-free',
}
$ppa_options = undef
$ppa_package = undef
+ if versioncmp($facts['os']['release']['major'], '9') >= 0 {
+ $auth_conf_owner = '_apt'
+ } else {
+ $auth_conf_owner = 'root'
+ }
}
'Ubuntu': {
$backports = {
}
'Ubuntu': {
$backports = {
@@
-96,6
+103,11
@@
class apt::params {
}
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
}
$ppa_options = '-y'
$ppa_package = 'software-properties-common'
+ if versioncmp($facts['os']['release']['full'], '16.04') >= 0 {
+ $auth_conf_owner = '_apt'
+ } else {
+ $auth_conf_owner = 'root'
+ }
}
undef: {
fail(translate('Unable to determine value for fact os[\"name\"]'))
}
undef: {
fail(translate('Unable to determine value for fact os[\"name\"]'))
@@
-104,6
+116,7
@@
class apt::params {
$ppa_options = undef
$ppa_package = undef
$backports = undef
$ppa_options = undef
$ppa_package = undef
$backports = undef
+ $auth_conf_owner = 'root'
}
}
}
}
}
}