summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-10-08 12:13:25 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-10-08 12:13:25 +0200
commitf60d0c69508a109065fe85e4d37a8d1ea7143a7b (patch)
tree500d01ecf9b0a74a8519d194d95e961c463bd020
parent99353ccdadf8aaefbd63945a7ec38406d6fc39f9 (diff)
downloadpuppet.FWSECK-f60d0c69508a109065fe85e4d37a8d1ea7143a7b.tar.gz
puppet.FWSECK-f60d0c69508a109065fe85e4d37a8d1ea7143a7b.tar.bz2
puppet.FWSECK-f60d0c69508a109065fe85e4d37a8d1ea7143a7b.zip
site.pp: Switch http-proxy for APT to squid-deb-proxy (rather than e2guardian).
-rw-r--r--code/environments/production/manifests/site.pp13
1 files changed, 13 insertions, 0 deletions
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':