From 7d268140db55874872b9fdc4fe86e2f548c37a43 Mon Sep 17 00:00:00 2001
From: Mark Janssen -- Sig-I/O Automatisering <mark@sig-io.nl>
Date: Thu, 11 Jul 2024 22:01:56 +0200
Subject: [PATCH] Integrate apt-minimal into apt.conf template

---
 roles/common/tasks/apt-minimal.yaml | 9 ---------
 roles/common/templates/apt-minimal  | 4 ----
 roles/common/templates/apt.conf.j2  | 3 +++
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 roles/common/tasks/apt-minimal.yaml
 delete mode 100644 roles/common/templates/apt-minimal

diff --git a/roles/common/tasks/apt-minimal.yaml b/roles/common/tasks/apt-minimal.yaml
deleted file mode 100644
index 5fbbaa0..0000000
--- a/roles/common/tasks/apt-minimal.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Configure auto-upgrades
-  ansible.builtin.template:
-    src: apt-minimal
-    dest: /etc/apt/apt.conf.d/20minimal
-    owner: root
-    group: root
-    mode: 0644
diff --git a/roles/common/templates/apt-minimal b/roles/common/templates/apt-minimal
deleted file mode 100644
index 452a6e6..0000000
--- a/roles/common/templates/apt-minimal
+++ /dev/null
@@ -1,4 +0,0 @@
-# Managed by Ansible
-
-APT::Install-Recommends "0";
-APT::Install-Suggests "0";
diff --git a/roles/common/templates/apt.conf.j2 b/roles/common/templates/apt.conf.j2
index 714bac0..7581cc8 100644
--- a/roles/common/templates/apt.conf.j2
+++ b/roles/common/templates/apt.conf.j2
@@ -6,3 +6,6 @@ Acquire::http::Proxy "http://{{ proxy_host }}:{{ proxy_port }}/";
 
 # Don't download translation-files
 Acquire::Languages "none";
+
+APT::Install-Recommends "0";
+APT::Install-Suggests "0";