diff options
| author | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-03-03 09:26:49 +0100 |
| commit | e596bfb9306664ab4aef78bc05615904b7c6e7f2 (patch) | |
| tree | d9759fedf3bdfdb4a4cd3aac1e3747abbeaacbd3 /manifests/proxy_client.pp | |
| parent | 08b066db441375d1613d131767cb1c5bdd3bb60b (diff) | |
| parent | d51e2af9d452731f63b2fe16391e9cd2ff9d640f (diff) | |
| download | puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.gz puppet-apt-e596bfb9306664ab4aef78bc05615904b7c6e7f2.tar.bz2 | |
Merge remote-tracking branch 'remotes/origin/master' into nadir_master
Conflicts:
README
files/50unattended-upgrades
files/lenny/50unattended-upgrades
files/squeeze/50unattended-upgrades
manifests/dist_upgrade.pp
manifests/init.pp
manifests/upgrade_package.pp
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'), } } |