From f60d0c69508a109065fe85e4d37a8d1ea7143a7b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 8 Oct 2020 12:13:25 +0200
Subject: site.pp: Switch http-proxy for APT to squid-deb-proxy (rather than
 e2guardian).

---
 code/environments/production/manifests/site.pp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'code')

diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 932f981..b5fd443 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -7,6 +7,19 @@ $apt_origins = [
 	'origin=IT-Zukunft Schule,n=${distro_codename},l=IT-Zukunft Schule',
 ]
 
+class apt_via_squid_deb_proxy {
+	file_line { 'apt.conf_httpproxy':
+		path  => '/etc/apt/apt.conf',
+		line  => 'Acquire::http::Proxy "http://unfiltered:8000";',
+		match => '^(|#\s*)Acquire::http::Proxy\ ".*";$',
+	}
+	file_line { 'apt.conf_ftpproxy':
+		path => '/etc/apt/apt.conf',
+		line  => 'Acquire::ftp::Proxy "http://unfiltered:8000";',
+		match => '^(|#\s*)Acquire::ftp::Proxy\ ".*";$',
+	}
+}
+
 class ssh_pubkeys_admins {
 	# Mike Gabriel, IT-Zukunft Schule
 	ssh_authorized_key { 'mike@minobo':
-- 
cgit v1.2.3