From 6fa0d687f7bdf3ba1e6a032118553d90ceba0b22 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Thu, 16 Jan 2020 01:13:27 +0200
Subject: [PATCH] __apt_unattended_upgrades: alternative approach

---
 .../type/__apt_unattended_upgrades/manifest   | 100 ++++++------------
 .../parameter/boolean                         |   5 -
 .../parameter/optional                        |   1 -
 .../parameter/optional_multiple               |   1 +
 4 files changed, 31 insertions(+), 76 deletions(-)
 delete mode 100644 cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
 delete mode 100644 cdist/conf/type/__apt_unattended_upgrades/parameter/optional

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index 094dfa1c..2f8f6e76 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -34,81 +34,41 @@ APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Unattended-Upgrade "1";
 EOF
 
-conf='# this file is managed by cdist'
-
-if [ -f "$__object/parameter/mail" ]
-then
-    conf="$(
-        printf \
-            '%s\nUnattended-Upgrade::Mail "%s";\n' \
-            "$conf" \
-            "$( cat "$__object/parameter/mail" )"
-        )"
-fi
-
-if [ -f "$__object/parameter/mail-only-on-error" ]
-then
-    conf="$(
-        printf \
-            '%s\nUnattended-Upgrade::MailOnlyOnError "true";\n' \
-            "$conf"
-        )"
-fi
-
-if [ -f "$__object/parameter/no-auto-fix-interrupted-dpkg" ]
-then
-    conf="$(
-        printf \
-            '%s\nUnattended-Upgrade::AutoFixInterruptedDpkg "false";\n' \
-            "$conf"
-        )"
-fi
-
-if [ -f "$__object/parameter/no-minimal-steps" ]
-then
-    conf="$(
-        printf \
-            '%s\nUnattended-Upgrade::MinimalSteps "false";\n' \
-            "$conf"
-        )"
-fi
-
-if [ -f "$__object/parameter/install-on-shutdown" ]
-then
-    conf="$(
-        printf \
-            '%s\nUnattended-Upgrade::InstallOnShutdown "true";\n' \
-            "$conf"
-        )"
-fi
-
-if [ -f "$__object/parameter/automatic-reboot" ]
-then
-    conf="$(
-        printf \
-            '%s\nUnattended-Upgrade::Automatic-Reboot "true";\n' \
-            "$conf"
-        )"
-fi
-
-if [ -f "$__object/parameter/blacklist" ]
-then
-    bl='Unattended-Upgrade::Package-Blacklist {';
-
-    while read -r l
-    do
-        bl="$( printf '%s\n"%s";\n' "$bl" "$l" )"
-    done \
-        < "$__object/parameter/blacklist"
-
-    conf="$( printf '%s\n%s\n}\n' "$conf" "$bl" )"
-fi
-
 # lets not write into upstream 50unattended-upgrades file,
 # but use our own config file to avoid clashes
 
 conf_file='/etc/apt/apt.conf.d/51unattended-upgrades-cdist'
 
+conf='# this file is managed by cdist'
+
+if [ -f "$__object/parameter/option" ]
+then
+    o=''
+
+    while read -r l
+    do
+        k="$( echo "$l" | awk -F= '{print $1}' )"
+        v="$( echo "$l" | awk -F= '{print $2}' )"
+        o="$( printf '%s\nUnattended-Upgrade::%s "%s";\n' "$o" "$k" "$v" )"
+    done \
+        < "$__object/parameter/option"
+
+    conf="$( printf '%s\n%s\n' "$conf" "$o" )"
+fi
+
+if [ -f "$__object/parameter/blacklist" ]
+then
+    b='Unattended-Upgrade::Package-Blacklist {'
+
+    while read -r l
+    do
+        b="$( printf '%s\n"%s";\n' "$b" "$l" )"
+    done \
+        < "$__object/parameter/blacklist"
+
+    conf="$( printf '%s\n%s\n}\n' "$conf" "$b" )"
+fi
+
 if [ "$( echo "$conf" | wc -l )" -gt 1 ]
 then
     echo "$conf" \
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean b/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
deleted file mode 100644
index 831dc95c..00000000
--- a/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
+++ /dev/null
@@ -1,5 +0,0 @@
-mail-only-on-error
-no-auto-fix-interrupted-dpkg
-no-minimal-steps
-install-on-shutdown
-automatic-reboot
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional
deleted file mode 100644
index fa7963cc..00000000
--- a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-mail
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
index 27b9ffc9..ea4fba2b 100644
--- a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
+++ b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
@@ -1 +1,2 @@
+option
 blacklist