Merge commit '27d5808299045ebd6f428e7d8131d11d9ab37712'.

One more painless merge commit.

Conflicts:
	manifests/init.pp

1 files changed, 16 insertions, 0 deletions

diff --git a/manifests/proxy_client.pp b/manifests/proxy_client.pp
new file mode 100644
index 0000000..9883933
--- /dev/null
+++ b/manifests/proxy_client.pp
@@ -0,0 +1,16 @@
+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
+  }
+
+  apt_conf { "20proxy":
+    content => template("apt/20proxy.erb"),
+  }
+}