diff options
| author | Micah Anderson <micah@riseup.net> | 2012-08-22 10:55:25 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-08-22 10:55:25 -0400 |
| commit | b528cd0005f263b3d2014cdc44d7461577821343 (patch) | |
| tree | 4cc18de35af7acec5c55b8658a0161c6dcbf6f49 | |
| parent | 0c2f31b5d5c972c179cb06ea1a06e6e0e7b1b262 (diff) | |
parameterize the apt::proxy_client class
| -rw-r--r-- | manifests/proxy_client.pp | 15 | ||||
| -rw-r--r-- | templates/20proxy.erb | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/manifests/proxy_client.pp b/manifests/proxy_client.pp index 23e9bd1..c284c74 100644 --- a/manifests/proxy_client.pp +++ b/manifests/proxy_client.pp @@ -1,14 +1,7 @@ -class apt::proxy_client { - - $real_apt_proxy = $apt_proxy ? { - "" => "http://localhost", - default => $apt_proxy - } - - $real_apt_proxy_port = $apt_proxy_port ? { - "" => "3142", - default => $apt_proxy_port - } +class apt::proxy_client( + $proxy = 'http://localhost', + $port = '3142', +){ apt_conf { "20proxy": content => template("apt/20proxy.erb"), diff --git a/templates/20proxy.erb b/templates/20proxy.erb index fd0c7fe..ea706b6 100644 --- a/templates/20proxy.erb +++ b/templates/20proxy.erb @@ -1,5 +1,5 @@ // This file is managed by Puppet // all local modifications will be overwritten -Acquire::http { Proxy "<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; }; +Acquire::http { Proxy "<%= proxy %>:<%= port %>"; }; Acquire::HTTP::Proxy::bugs.debian.org "DIRECT"; |