From 94e32dcd78d73ea5f09845cfdd4f488095f17145 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Sat, 4 Jan 2020 16:36:44 +0200
Subject: [PATCH 01/11] __apt_unattended_upgrades: initial commit

---
 .../type/__apt_unattended_upgrades/manifest   | 74 +++++++++++++++++++
 .../parameter/boolean                         |  1 +
 .../parameter/optional                        |  1 +
 .../parameter/optional_multiple               |  1 +
 .../type/__apt_unattended_upgrades/singleton  |  0
 5 files changed, 77 insertions(+)
 create mode 100755 cdist/conf/type/__apt_unattended_upgrades/manifest
 create mode 100644 cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
 create mode 100644 cdist/conf/type/__apt_unattended_upgrades/parameter/optional
 create mode 100644 cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
 create mode 100644 cdist/conf/type/__apt_unattended_upgrades/singleton

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
new file mode 100755
index 00000000..bf4d825a
--- /dev/null
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -0,0 +1,74 @@
+#!/bin/sh -e
+
+__package unattended-upgrades
+
+# in normal circumstances 20auto-upgrades is managed
+# by debconf and it can only contain these lines
+# https://wiki.debian.org/UnattendedUpgrades
+
+require='__package/unattended-upgrades' \
+    __file /etc/apt/apt.conf.d/20auto-upgrades \
+        --owner root \
+        --group root \
+        --mode 644 \
+        --source - << EOF
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Unattended-Upgrade "1";
+EOF
+
+# lets not write into upstream 50unattended-upgrades file,
+# but use our own config files to avoid clashes
+
+ml_conf='/etc/apt/apt.conf.d/51unattended-upgrades-mail'
+bl_conf='/etc/apt/apt.conf.d/51unattended-upgrades-blacklist'
+
+if [ -f "$__object/parameter/mail" ]
+then
+    mail="$( cat "$__object/parameter/mail" )"
+else
+    mail=''
+fi
+
+if [ -n "$mail" ]
+then
+    if [ -f "$__object/parameter/mail-on-error" ]
+    then
+        mail_on_error='true'
+    else
+        mail_on_error='false'
+    fi
+
+    __file "$ml_conf" \
+        --owner root \
+        --group root \
+        --mode 644 \
+        --source - << EOF
+Unattended-Upgrade::Mail "$mail";
+Unattended-Upgrade::MailOnlyOnError "$mail_on_error";
+EOF
+
+else
+    __file "$ml_conf" --state absent
+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"
+
+    bl="$( printf '%s\n}' "$bl" )"
+
+    echo "$bl" \
+        | __file "$bl_conf" \
+            --owner root \
+            --group root \
+            --mode 644 \
+            --source -
+else
+    __file "$bl_conf" --state absent
+fi
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean b/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
new file mode 100644
index 00000000..edcaa12a
--- /dev/null
+++ b/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
@@ -0,0 +1 @@
+mail-on-error
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional
new file mode 100644
index 00000000..fa7963cc
--- /dev/null
+++ b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional
@@ -0,0 +1 @@
+mail
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
new file mode 100644
index 00000000..27b9ffc9
--- /dev/null
+++ b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
@@ -0,0 +1 @@
+blacklist
diff --git a/cdist/conf/type/__apt_unattended_upgrades/singleton b/cdist/conf/type/__apt_unattended_upgrades/singleton
new file mode 100644
index 00000000..e69de29b

From a9d491f998c2b41ad97bfeace7f1d24a73ff7482 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Sat, 4 Jan 2020 16:59:42 +0200
Subject: [PATCH 02/11] __apt_unattended_upgrades: add license header

---
 .../type/__apt_unattended_upgrades/manifest    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index bf4d825a..88a5ccd8 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -1,4 +1,22 @@
 #!/bin/sh -e
+#
+# 2020 Ander Punnar (ander-at-kvlt-dot-ee)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
 
 __package unattended-upgrades
 

From ec8d9571f971c0a0616acdccc9a32589f1b6f042 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Sat, 4 Jan 2020 17:07:46 +0200
Subject: [PATCH 03/11] __apt_unattended_upgrades: add manual

---
 .../type/__apt_unattended_upgrades/man.rst    | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 cdist/conf/type/__apt_unattended_upgrades/man.rst

diff --git a/cdist/conf/type/__apt_unattended_upgrades/man.rst b/cdist/conf/type/__apt_unattended_upgrades/man.rst
new file mode 100644
index 00000000..d64b2e9e
--- /dev/null
+++ b/cdist/conf/type/__apt_unattended_upgrades/man.rst
@@ -0,0 +1,54 @@
+cdist-type__apt_unattended_upgrades(7)
+======================================
+
+NAME
+----
+cdist-type__apt_unattended_upgrades - automatic installation of updates
+
+
+DESCRIPTION
+-----------
+
+Install and configure unattended-upgrades package.
+
+
+OPTIONAL PARAMETERS
+-------------------
+mail
+   Send email to this address for problems or packages upgrades.
+
+
+OPTIONAL MULTIPLE PARAMETERS
+----------------------------
+blacklist
+   Python regular expressions, matching packages to exclude from upgrading.
+
+
+BOOLEAN PARAMETERS
+------------------
+mail-on-error
+   Get emails only on errors.
+
+
+EXAMPLES
+--------
+
+.. code-block:: sh
+
+    __apt_unattended_upgrades \
+        --mail root \
+        --mail-on-error \
+        --blacklist multipath-tools \
+        --blacklist open-iscsi
+
+AUTHORS
+-------
+Ander Punnar <ander-at-kvlt-dot-ee>
+
+
+COPYING
+-------
+Copyright \(C) 2020 Ander Punnar. You can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option) any
+later version.

From cd2d5b3f79d1e3ea8545b67096d67d6ceda763e6 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Wed, 15 Jan 2020 19:24:21 +0200
Subject: [PATCH 04/11] __apt_unattended_upgrades: all objects depend on
 package

---
 cdist/conf/type/__apt_unattended_upgrades/manifest | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index 88a5ccd8..811e79a6 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -20,16 +20,17 @@
 
 __package unattended-upgrades
 
+export require='__package/unattended-upgrades'
+
 # in normal circumstances 20auto-upgrades is managed
 # by debconf and it can only contain these lines
 # https://wiki.debian.org/UnattendedUpgrades
 
-require='__package/unattended-upgrades' \
-    __file /etc/apt/apt.conf.d/20auto-upgrades \
-        --owner root \
-        --group root \
-        --mode 644 \
-        --source - << EOF
+__file /etc/apt/apt.conf.d/20auto-upgrades \
+    --owner root \
+    --group root \
+    --mode 644 \
+    --source - << EOF
 APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Unattended-Upgrade "1";
 EOF

From 68e5502fce3d3ae043ae0792a14abd1970834d36 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Wed, 15 Jan 2020 19:27:02 +0200
Subject: [PATCH 05/11] __apt_unattended_upgrades: move debian wiki link to
 manual

---
 cdist/conf/type/__apt_unattended_upgrades/man.rst  | 2 ++
 cdist/conf/type/__apt_unattended_upgrades/manifest | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/man.rst b/cdist/conf/type/__apt_unattended_upgrades/man.rst
index d64b2e9e..f75c6513 100644
--- a/cdist/conf/type/__apt_unattended_upgrades/man.rst
+++ b/cdist/conf/type/__apt_unattended_upgrades/man.rst
@@ -11,6 +11,8 @@ DESCRIPTION
 
 Install and configure unattended-upgrades package.
 
+For more information see https://wiki.debian.org/UnattendedUpgrades.
+
 
 OPTIONAL PARAMETERS
 -------------------
diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index 811e79a6..03cc2c50 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -24,7 +24,6 @@ export require='__package/unattended-upgrades'
 
 # in normal circumstances 20auto-upgrades is managed
 # by debconf and it can only contain these lines
-# https://wiki.debian.org/UnattendedUpgrades
 
 __file /etc/apt/apt.conf.d/20auto-upgrades \
     --owner root \

From cd24a806e7be7b3300543943e8c7a5582a55d15e Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Wed, 15 Jan 2020 20:48:32 +0200
Subject: [PATCH 06/11] __apt_unattended_upgrades: rewrite manifest, add more
 parameters

---
 .../type/__apt_unattended_upgrades/manifest   | 88 +++++++++++++------
 .../parameter/boolean                         |  4 +
 2 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index 03cc2c50..cb99b611 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -34,39 +34,61 @@ APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Unattended-Upgrade "1";
 EOF
 
-# lets not write into upstream 50unattended-upgrades file,
-# but use our own config files to avoid clashes
-
-ml_conf='/etc/apt/apt.conf.d/51unattended-upgrades-mail'
-bl_conf='/etc/apt/apt.conf.d/51unattended-upgrades-blacklist'
+conf='# this file is managed by cdist'
 
 if [ -f "$__object/parameter/mail" ]
 then
-    mail="$( cat "$__object/parameter/mail" )"
-else
-    mail=''
+    conf="$(
+        printf \
+            '%s\nUnattended-Upgrade::Mail "%s";\n' \
+            "$conf" \
+            "$( cat "$__object/parameter/mail" )"
+        )"
 fi
 
-if [ -n "$mail" ]
+if [ -f "$__object/parameter/mail-on-error" ]
 then
-    if [ -f "$__object/parameter/mail-on-error" ]
-    then
-        mail_on_error='true'
-    else
-        mail_on_error='false'
-    fi
+    conf="$(
+        printf \
+            '%s\nUnattended-Upgrade::MailOnlyOnError "true";\n' \
+            "$conf"
+        )"
+fi
 
-    __file "$ml_conf" \
-        --owner root \
-        --group root \
-        --mode 644 \
-        --source - << EOF
-Unattended-Upgrade::Mail "$mail";
-Unattended-Upgrade::MailOnlyOnError "$mail_on_error";
-EOF
+if [ -f "$__object/parameter/no-auto-fix" ]
+then
+    conf="$(
+        printf \
+            '%s\nUnattended-Upgrade::AutoFixInterruptedDpkg "false";\n' \
+            "$conf"
+        )"
+fi
 
-else
-    __file "$ml_conf" --state absent
+if [ -f "$__object/parameter/no-minimal-steps" ]
+then
+    conf="$(
+        printf \
+            '%s\nUnattended-Upgrade::MinimalSteps "false";\n' \
+            "$conf"
+        )"
+fi
+
+if [ -f "$__object/parameter/on-shutdown" ]
+then
+    conf="$(
+        printf \
+            '%s\nUnattended-Upgrade::InstallOnShutdown "true";\n' \
+            "$conf"
+        )"
+fi
+
+if [ -f "$__object/parameter/reboot" ]
+then
+    conf="$(
+        printf \
+            '%s\nUnattended-Upgrade::Automatic-Reboot "true";\n' \
+            "$conf"
+        )"
 fi
 
 if [ -f "$__object/parameter/blacklist" ]
@@ -79,14 +101,22 @@ then
     done \
         < "$__object/parameter/blacklist"
 
-    bl="$( printf '%s\n}' "$bl" )"
+    conf="$( printf '%s\n%s\n}\n' "$conf" "$bl" )"
+fi
 
-    echo "$bl" \
-        | __file "$bl_conf" \
+# lets not write into upstream 50unattended-upgrades file,
+# but use our own config files to avoid clashes
+
+conf_file='/etc/apt/apt.conf.d/51unattended-upgrades-cdist'
+
+if [ "$( echo "$conf" | wc -l )" -gt 1 ]
+then
+    echo "$conf" \
+        | __file "$conf_file" \
             --owner root \
             --group root \
             --mode 644 \
             --source -
 else
-    __file "$bl_conf" --state absent
+    __file "$conf_file" --state absent
 fi
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean b/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
index edcaa12a..6ad9790f 100644
--- a/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
+++ b/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
@@ -1 +1,5 @@
 mail-on-error
+no-auto-fix
+no-minimal-steps
+on-shutdown
+reboot

From b3f36dbe5bc7d1e21892f765ee08dfc5d8c6a6e3 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Wed, 15 Jan 2020 20:51:47 +0200
Subject: [PATCH 07/11] __apt_unattended_upgrades: fix typo

---
 cdist/conf/type/__apt_unattended_upgrades/manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index cb99b611..04225a9b 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -105,7 +105,7 @@ then
 fi
 
 # lets not write into upstream 50unattended-upgrades file,
-# but use our own config files to avoid clashes
+# but use our own config file to avoid clashes
 
 conf_file='/etc/apt/apt.conf.d/51unattended-upgrades-cdist'
 

From f5f70671cb3e4ca8b2d5e2a0e66a1847f05ef4bf Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Thu, 16 Jan 2020 00:59:03 +0200
Subject: [PATCH 08/11] __apt_unattended_upgrades: make parameters more
 speaking

---
 cdist/conf/type/__apt_unattended_upgrades/manifest        | 8 ++++----
 .../conf/type/__apt_unattended_upgrades/parameter/boolean | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index 04225a9b..094dfa1c 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -46,7 +46,7 @@ then
         )"
 fi
 
-if [ -f "$__object/parameter/mail-on-error" ]
+if [ -f "$__object/parameter/mail-only-on-error" ]
 then
     conf="$(
         printf \
@@ -55,7 +55,7 @@ then
         )"
 fi
 
-if [ -f "$__object/parameter/no-auto-fix" ]
+if [ -f "$__object/parameter/no-auto-fix-interrupted-dpkg" ]
 then
     conf="$(
         printf \
@@ -73,7 +73,7 @@ then
         )"
 fi
 
-if [ -f "$__object/parameter/on-shutdown" ]
+if [ -f "$__object/parameter/install-on-shutdown" ]
 then
     conf="$(
         printf \
@@ -82,7 +82,7 @@ then
         )"
 fi
 
-if [ -f "$__object/parameter/reboot" ]
+if [ -f "$__object/parameter/automatic-reboot" ]
 then
     conf="$(
         printf \
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean b/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
index 6ad9790f..831dc95c 100644
--- a/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
+++ b/cdist/conf/type/__apt_unattended_upgrades/parameter/boolean
@@ -1,5 +1,5 @@
-mail-on-error
-no-auto-fix
+mail-only-on-error
+no-auto-fix-interrupted-dpkg
 no-minimal-steps
-on-shutdown
-reboot
+install-on-shutdown
+automatic-reboot

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 09/11] __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

From 6097cd9e90341146948886a9480cd0b70ee9e60f Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Fri, 17 Jan 2020 14:41:00 +0200
Subject: [PATCH 10/11] __apt_unattended_upgrades: use word expansions

---
 cdist/conf/type/__apt_unattended_upgrades/manifest | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
index 2f8f6e76..3c00e2f4 100755
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ b/cdist/conf/type/__apt_unattended_upgrades/manifest
@@ -47,9 +47,7 @@ then
 
     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" )"
+        o="$( printf '%s\nUnattended-Upgrade::%s "%s";\n' "$o" "${l%%=*}" "${l#*=}" )"
     done \
         < "$__object/parameter/option"
 

From 65c5b592a590f3f4f8b31a1b7c32b2a98354d054 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Fri, 17 Jan 2020 14:48:54 +0200
Subject: [PATCH 11/11] __apt_unattended_upgrades: update manual

---
 .../type/__apt_unattended_upgrades/man.rst    | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/cdist/conf/type/__apt_unattended_upgrades/man.rst b/cdist/conf/type/__apt_unattended_upgrades/man.rst
index f75c6513..2231b5f9 100644
--- a/cdist/conf/type/__apt_unattended_upgrades/man.rst
+++ b/cdist/conf/type/__apt_unattended_upgrades/man.rst
@@ -14,35 +14,47 @@ Install and configure unattended-upgrades package.
 For more information see https://wiki.debian.org/UnattendedUpgrades.
 
 
-OPTIONAL PARAMETERS
--------------------
-mail
-   Send email to this address for problems or packages upgrades.
-
-
 OPTIONAL MULTIPLE PARAMETERS
 ----------------------------
+option
+   Set options for unattended-upgrades. See examples.
+
+   Supported options with default values (as of 2020-01-17) are:
+
+   - AutoFixInterruptedDpkg, default is "true"
+   - MinimalSteps, default is "true"
+   - InstallOnShutdown, default is "false"
+   - Mail, default is "" (empty)
+   - MailOnlyOnError, default is "false"
+   - Remove-Unused-Kernel-Packages, default is "true"
+   - Remove-New-Unused-Dependencies, default is "true"
+   - Remove-Unused-Dependencies, default is "false"
+   - Automatic-Reboot, default is "false"
+   - Automatic-Reboot-WithUsers, default is "true"
+   - Automatic-Reboot-Time, default is "02:00"
+   - SyslogEnable, default is "false"
+   - SyslogFacility, default is "daemon"
+   - OnlyOnACPower, default is "true"
+   - Skip-Updates-On-Metered-Connections, default is "true"
+   - Verbose, default is "false"
+   - Debug, default is "false"
+
 blacklist
    Python regular expressions, matching packages to exclude from upgrading.
 
 
-BOOLEAN PARAMETERS
-------------------
-mail-on-error
-   Get emails only on errors.
-
-
 EXAMPLES
 --------
 
 .. code-block:: sh
 
     __apt_unattended_upgrades \
-        --mail root \
-        --mail-on-error \
+        --option Mail=root \
+        --option MailOnlyOnError=true \
         --blacklist multipath-tools \
         --blacklist open-iscsi
 
+
 AUTHORS
 -------
 Ander Punnar <ander-at-kvlt-dot-ee>