Merge branch 'master' of git://labs.riseup.net/shared-apt

Conflicts:
	manifests/init.pp
	templates/sources.list.backports.erb

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..23e9bd1
--- /dev/null
+++ b/manifests/proxy_client.pp
@@ -0,0 +1,16 @@
+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
+  }
+
+  apt_conf { "20proxy":
+    content => template("apt/20proxy.erb"),
+  }
+}