diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:24:57 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:24:57 +0100 |
| commit | ee6d13d1e42acca7374aa302a4f9dfa9001d799f (patch) | |
| tree | f7d45d0a313a9fd5794ed11ee47418f53fb07047 /manifests/proxy-client.pp | |
| parent | 06a2957f9f0c2b4060709150afa194b98c6995ba (diff) | |
| parent | ac76a5d52df78aec919f08334ca5b140902a9298 (diff) | |
Merge commit 'ac76a5d52df78aec919f08334ca5b140902a9298'
(Starting to merge changes from immerda.)
Conflicts:
manifests/default_sources_list.pp
manifests/init.pp
Diffstat (limited to 'manifests/proxy-client.pp')
| -rw-r--r-- | manifests/proxy-client.pp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/manifests/proxy-client.pp b/manifests/proxy-client.pp index ea0a29c..30bda8a 100644 --- a/manifests/proxy-client.pp +++ b/manifests/proxy-client.pp @@ -10,9 +10,7 @@ class apt::proxy-client { 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; + apt_conf_snippet { "20proxy": + content => template("apt/20proxy.erb"), } } |