From ffd15afa3af834ce24ce957f8d6a22cc7e4aa6e8 Mon Sep 17 00:00:00 2001
From: Paul Lecuq <paul@paulbsd.com>
Date: Tue, 17 Jan 2023 14:44:10 +0100
Subject: [PATCH] updated apt state

---
 states/apt/defaults.yaml | 22 +++++++---------------
 states/apt/init.sls      |  4 ++--
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/states/apt/defaults.yaml b/states/apt/defaults.yaml
index ddefc93..f24e5c4 100644
--- a/states/apt/defaults.yaml
+++ b/states/apt/defaults.yaml
@@ -5,20 +5,12 @@ apt:
     hostname: apt.local
     port: 8000
   config:
+    10periodic:
+      - APT::Periodic::Update-Package-Lists "1";
+      - APT::Periodic::Download-Upgradeable-Packages "1";
+      - APT::Periodic::AutocleanInterval "0";
     10proxy:
-      content:
-        - Acquire::http::ProxyAutoDetect "/usr/local/bin/apt-proxy-detect.py";
-        - Acquire::https::Proxy "DIRECT";
+      - Acquire::http::ProxyAutoDetect "/usr/local/bin/apt-proxy-detect.py";
+      - Acquire::https::Proxy "DIRECT";
     99unauth:
-      content:
-        - APT::Get::AllowUnauthenticated "true";
-
-# apt:
-#   config:
-#     10proxy:
-#       content:
-#         - Acquire::http::Proxy "http://proxy:8000";
-#         - Acquire::https::Proxy "DIRECT";
-#     99unauth:
-#       content:
-#         - APT::Get::AllowUnauthenticated "true";
+      - APT::Get::AllowUnauthenticated "true";
diff --git a/states/apt/init.sls b/states/apt/init.sls
index c0e68bd..e3a3527 100644
--- a/states/apt/init.sls
+++ b/states/apt/init.sls
@@ -20,5 +20,5 @@ apt-proxy-{{ itemkey }}:
     - user: root
     - group: root
     - mode: "0644"
-    - contents: {{ itemvalue.content }}
-{% endfor -%}
\ No newline at end of file
+    - contents: {{ itemvalue }}
+{% endfor -%}