diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-10 10:11:18 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-10 10:19:06 +0100 |
| commit | 2cd9496999af2dd00a203f38c4e1f4393c7f3f62 (patch) | |
| tree | a74f18ccf51d7f48752b37d3a8f39705972eac05 /manifests/proxy-client.pp | |
| parent | c43bfac6b80489cf789fe448abb3561a6655a969 (diff) | |
| parent | 5bf01f148d2c2db8523febc0d73591444c5965c9 (diff) | |
| download | puppet-apt-2cd9496999af2dd00a203f38c4e1f4393c7f3f62.tar.gz puppet-apt-2cd9496999af2dd00a203f38c4e1f4393c7f3f62.tar.bz2 | |
Merge remote branch 'nadir/master'
Conflicts:
README
manifests/custom_sources.pp
manifests/default_preferences.pp
manifests/init.pp
manifests/unattended_upgrades.pp
templates/Debian/sources.list.volatile.erb
Diffstat (limited to 'manifests/proxy-client.pp')
| -rw-r--r-- | manifests/proxy-client.pp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/manifests/proxy-client.pp b/manifests/proxy-client.pp new file mode 100644 index 0000000..ea0a29c --- /dev/null +++ b/manifests/proxy-client.pp @@ -0,0 +1,18 @@ +class apt::proxy-client { + + $real_apt_proxy = $apt_proxy ? { + "" => "localhost", + default => $apt_proxy + } + + $real_apt_proxy_port = $apt_proxy_port ? { + "" => "3142", + default => $apt_proxy_port + } + + file { "/etc/apt/apt.conf.d/20proxy": + ensure => present, + content => "Acquire::http { Proxy \"http://$real_apt_proxy:$real_apt_proxy_port\"; };\n", + owner => root, group => 0, mode => 0644; + } +} |