From 93f9565c5513f8bd837eb40305149e1ea55361f3 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andi@debian.org>
Date: Sun, 26 Jun 2022 12:59:09 +0200
Subject: [PATCH] Continue eliminating hardcoded apt-proxy.

---
 edubox.yml                         | 10 +++-------
 roles/aptcacher/files/apt.conf     |  1 -
 roles/educontainer/tasks/setup.yml |  5 ++---
 3 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 roles/aptcacher/files/apt.conf

diff --git a/edubox.yml b/edubox.yml
index 5bcea15..a850c29 100644
--- a/edubox.yml
+++ b/edubox.yml
@@ -51,15 +51,11 @@
   pre_tasks:
     - name: install apt-cacher-ng
       apt:
-        name: apt-cacher-ng
+        name:
+          - apt-cacher-ng
+          - auto-apt-proxy
         state: latest # noqa package-latest
 
-    - name: enable apt-cacher-ng
-      lineinfile:
-        path: /etc/apt/apt.conf.d/30proxy
-        line: 'Acquire::http::Proxy "http://localhost:3142/";'
-        create: true
-
     - name: enable and start systemd-networkd on the host
       systemd:
         name: systemd-networkd
diff --git a/roles/aptcacher/files/apt.conf b/roles/aptcacher/files/apt.conf
deleted file mode 100644
index d5e98b3..0000000
--- a/roles/aptcacher/files/apt.conf
+++ /dev/null
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://localhost:3142";
diff --git a/roles/educontainer/tasks/setup.yml b/roles/educontainer/tasks/setup.yml
index 4296a72..aa117ee 100644
--- a/roles/educontainer/tasks/setup.yml
+++ b/roles/educontainer/tasks/setup.yml
@@ -5,6 +5,7 @@
     name:
       - systemd-container
       - debootstrap
+      - auto-apt-proxy
     state: latest # noqa package-latest
 
 - name: prepare machine directory
@@ -16,15 +17,13 @@
 - name: debootstrap base system
   command:
     cmd: >
-      debootstrap
+      auto-apt-proxy debootstrap
       --include={{ cont_packages | union(cont_packages_extra) | join(',') }}
       --components=main,contrib,non-free stable
       {{ contname }}00 http://deb.debian.org/debian
   args:
     chdir: /var/lib/machines/
     creates: /var/lib/machines/{{ contname }}00
-  environment:
-    http_proxy: "{{ '' if run_in_installer|default(false) else 'http://localhost:3142' }}"
   notify: enable and restart containers
 
 - name: provide complete apt sources