diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
| commit | c2219fa645251599b797b2574e6a68212d676f66 (patch) | |
| tree | b2b5cb63bee1abc3f2ae31b81cd417b292355b6c /manifests/proxy_client.pp | |
| parent | 8bfd579a82b6f824b0184bb2e33a384254426eec (diff) | |
| parent | 14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff) | |
| download | puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.gz puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Conflicts:
templates/Ubuntu/sources.list.erb
Diffstat (limited to 'manifests/proxy_client.pp')
| -rw-r--r-- | manifests/proxy_client.pp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/manifests/proxy_client.pp b/manifests/proxy_client.pp index 23e9bd1..9ba79f2 100644 --- a/manifests/proxy_client.pp +++ b/manifests/proxy_client.pp @@ -1,16 +1,9 @@ -class apt::proxy_client { +class apt::proxy_client( + $proxy = 'http://localhost', + $port = '3142', +){ - $real_apt_proxy = $apt_proxy ? { - "" => "http://localhost", - default => $apt_proxy - } - - $real_apt_proxy_port = $apt_proxy_port ? { - "" => "3142", - default => $apt_proxy_port - } - - apt_conf { "20proxy": - content => template("apt/20proxy.erb"), + apt_conf { '20proxy': + content => template('apt/20proxy.erb'), } } |