Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions manifests/package/apt.pp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
# Uses the puppetlabs-apt module to manage apt package manager proxies
# https://forge.puppetlabs.com/puppetlabs/apt
class httpproxy::package::apt {
contain apt

class { 'apt':
proxy => {
'ensure' => $httpproxy::packagemanager::ensure,
'host' => $httpproxy::http_proxy,
'port' => $httpproxy::http_proxy_port,
},
if !defined(Apt::Setting['conf-proxy']) {
$content = @("EOL"/L)
// This file is managed by Puppet. DO NOT EDIT.
Acquire::http::proxy "http://$httpproxy::http_proxy:$httpproxy::http_proxy_port/";
| EOL

apt::setting { 'conf-proxy':
ensure => $httpproxy::packagemanager::ensure,
priority => '01',
content => $content,
}
}
contain 'apt'
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"name": "puppetlabs/apt",
"version_requirement": ">= 2.2.0 < 9.0.0"
"version_requirement": ">= 2.2.0 < 10.0.0"
}
],
"operatingsystem_support": [
Expand Down