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
Merge pull request #865 from tphoney/FM-7709
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
params.pp
diff --git
a/manifests/params.pp
b/manifests/params.pp
index 196bb0ebf6274506427a7abc55557d5284676e30..76f06b9ed4bffa391ef7b3ed90bd9d74497cfc9a 100644
(file)
--- a/
manifests/params.pp
+++ b/
manifests/params.pp
@@
-5,7
+5,7
@@
class apt::params {
if $::osfamily != 'Debian' {
class apt::params {
if $::osfamily != 'Debian' {
- fail(
'This module only works on Debian or derivatives like Ubuntu'
)
+ fail(
translate('This module only works on Debian or derivatives like Ubuntu')
)
}
$root = '/etc/apt'
}
$root = '/etc/apt'
@@
-26,6
+26,7
@@
class apt::params {
$ppas = {}
$pins = {}
$settings = {}
$ppas = {}
$pins = {}
$settings = {}
+ $manage_auth_conf = true
$auth_conf_entries = []
$config_files = {
$auth_conf_entries = []
$config_files = {
@@
-81,11
+82,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 = {
@@
-95,14
+100,20
@@
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: {
}
undef: {
- fail(
'Unable to determine value for fact os["name"]'
)
+ fail(
translate('Unable to determine value for fact os[\"name\"]')
)
}
default: {
$ppa_options = undef
$ppa_package = undef
$backports = undef
}
default: {
$ppa_options = undef
$ppa_package = undef
$backports = undef
+ $auth_conf_owner = 'root'
}
}
}
}
}
}