Add APT config snippets for approx and squid (replacing older similar full-configs).

4 files changed, 2 insertions, 12 deletions

diff --git a/apt/apt.conf.d/99-local-approx b/apt/apt.conf.d/99-local-approx
new file mode 100644
index 0000000..478cf2d
--- /dev/null
+++ b/apt/apt.conf.d/99-local-approx
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://localhost:9999";
diff --git a/apt/apt.conf.d/99-local-squid b/apt/apt.conf.d/99-local-squid
new file mode 100644
index 0000000..fdf0b5d
--- /dev/null
+++ b/apt/apt.conf.d/99-local-squid
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://localhost:3128/";
diff --git a/apt/apt.conf.noproxy b/apt/apt.conf.noproxy
deleted file mode 100644
index 6f18aed..0000000
--- a/apt/apt.conf.noproxy
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-// Acquire::http::Proxy "http://proxy:3128/";
-// Acquire::http::Pipeline-Depth "0";
-// Pre-configure all packages before they are installed.
-// (Automatically added by debconf.)
-DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
diff --git a/apt/apt.conf.proxy b/apt/apt.conf.proxy
deleted file mode 100644
index e99c678..0000000
--- a/apt/apt.conf.proxy
+++ /dev/null
@@ -1,6 +0,0 @@
-Acquire::http::Proxy "http://proxy:3128/";
-// Acquire::http::Proxy "http://proxy:8080/";
-// Acquire::http::Pipeline-Depth "0";
-// Pre-configure all packages before they are installed.
-// (Automatically added by debconf.)
-DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};