diff options
author | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
commit | 517040bb2e088325c2baa5bc4e9860d218357669 (patch) | |
tree | eeca8062bf072c780aafe6f3b6ae22782a8e1914 /manifests/proxy_client.pp | |
parent | cda713fcf6bd189c3e870c9e466aa5f41d1847b6 (diff) | |
parent | 07a031f2050deecfefa205e1e0c63586692a06ff (diff) | |
download | puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.gz puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.bz2 |
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts:
README
manifests/cron/dist_upgrade.pp
manifests/cron/download.pp
manifests/init.pp
manifests/preferences.pp
Diffstat (limited to 'manifests/proxy_client.pp')
-rw-r--r-- | manifests/proxy_client.pp | 15 |
1 files changed, 4 insertions, 11 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"), |