Adjust config to match bionic branch

Signed-off-by: Knut Ahlers <knut@ahlers.me>

README.md

@@ -4,10 +4,10 @@ This role installs required packages for unattended upgrades and configures them
 
 ## Requirements
 
-- Ubuntu >= 16.04 (xenial)
+- Ubuntu >= 18.04 (xenial)
 
 ## Usage
 
 See the [Ansible Galaxy Intro](https://galaxy.ansible.com/intro) for usage of roles within Ansible Galaxy.
 
-For configuration variables and how to use them see [defaults/main.yml](defaults/main.yml).
+For configuration variables and how to use them see [templates/50unattended-upgrades](templates/50unattended-upgrades).

defaults/main.yml

@@ -5,16 +5,4 @@ unattended_allowed_origins:
 - '"${distro_id}:${distro_codename}-security";'
 - '"${distro_id}:${distro_codename}-updates";'
 
-unattended_package_blacklist: []
+...
-
-unattended_auto_fix_interrupted_dpkg: true
-unattended_automatic_reboot: false
-unattended_install_on_shutdown: false
-unattended_mail: "mail@example.com"
-unattended_mail_only_on_error: false
-unattended_minimal_steps: false
-unattended_reboot_time: "now"
-unattended_reboot_with_users: true
-unattended_remove_unused_dependencies: false
-unattended_syslog_enable: false
-unattended_syslog_facility: "daemon"

templates/50unattended-upgrades

@@ -7,56 +7,61 @@ Unattended-Upgrade::Allowed-Origins {
 
 // List of packages to not update (regexp are supported)
 Unattended-Upgrade::Package-Blacklist {
-{% for line in unattended_package_blacklist %}
+{% for line in unattended_package_blacklist | default([]) %}
   {{ line }}
 {% endfor %}
 };
 
+// This option will controls whether the development release of Ubuntu will be
+// upgraded automatically.
+Unattended-Upgrade::DevRelease "{{ unattended_dev_releases | default(false) | to_json }}";
+
 // This option allows you to control if on a unclean dpkg exit
 // unattended-upgrades will automatically run
 //   dpkg --force-confold --configure -a
 // The default is true, to ensure updates keep getting installed
-Unattended-Upgrade::AutoFixInterruptedDpkg "{{ unattended_auto_fix_interrupted_dpkg | to_json }}";
+Unattended-Upgrade::AutoFixInterruptedDpkg "{{ unattended_auto_fix_interrupted_dpkg | default(true) | to_json }}";
 
 // Split the upgrade into the smallest possible chunks so that
 // they can be interrupted with SIGUSR1. This makes the upgrade
 // a bit slower but it has the benefit that shutdown while a upgrade
 // is running is possible (with a small delay)
-Unattended-Upgrade::MinimalSteps "{{ unattended_minimal_steps | to_json }}";
+Unattended-Upgrade::MinimalSteps "{{ unattended_minimal_steps | default(false) | to_json }}";
 
 // Install all unattended-upgrades when the machine is shuting down
 // instead of doing it in the background while the machine is running
 // This will (obviously) make shutdown slower
-Unattended-Upgrade::InstallOnShutdown "{{ unattended_install_on_shutdown | to_json }}";
+Unattended-Upgrade::InstallOnShutdown "{{ unattended_install_on_shutdown | default(false) | to_json }}";
 
 // Send email to this address for problems or packages upgrades
 // If empty or unset then no email is sent, make sure that you
 // have a working mail setup on your system. A package that provides
 // 'mailx' must be installed. E.g. "user@example.com"
-Unattended-Upgrade::Mail "{{ unattended_mail }}";
+Unattended-Upgrade::Mail "{{ unattended_mail | default('root') }}";
 
 // Set this value to "true" to get emails only on errors. Default
 // is to always send a mail if Unattended-Upgrade::Mail is set
-Unattended-Upgrade::MailOnlyOnError "{{ unattended_mail_only_on_error | to_json }}";
+Unattended-Upgrade::MailOnlyOnError "{{ unattended_mail_only_on_error | default(false) | to_json }}";
+
+// Remove unused automatically installed kernel-related packages
+// (kernel images, kernel headers and kernel version locked tools).
+Unattended-Upgrade::Remove-Unused-Kernel-Packages "{{ unattended_remove_unused_kernel_packages | default(false) | to_json }}";
 
 // Do automatic removal of new unused dependencies after the upgrade
 // (equivalent to apt-get autoremove)
-Unattended-Upgrade::Remove-Unused-Dependencies "{{ unattended_remove_unused_dependencies | to_json }}";
+Unattended-Upgrade::Remove-Unused-Dependencies "{{ unattended_remove_unused_dependencies | default(false) | to_json }}";
 
 // Automatically reboot *WITHOUT CONFIRMATION*
 //  if the file /var/run/reboot-required is found after the upgrade
-Unattended-Upgrade::Automatic-Reboot "{{ unattended_automatic_reboot | to_json }}";
+Unattended-Upgrade::Automatic-Reboot "{{ unattended_automatic_reboot | default(false) | to_json }}";
-
-// Automatically reboot even if there are users currently logged in.
-Unattended-Upgrade::Automatic-Reboot-WithUsers "{{ unattended_reboot_with_users | to_json }}";
 
 // If automatic reboot is enabled and needed, reboot at the specific
 // time instead of immediately
 //  Default: "now"
-Unattended-Upgrade::Automatic-Reboot-Time "{{ unattended_reboot_time }}";
+Unattended-Upgrade::Automatic-Reboot-Time "{{ unattended_reboot_time | default("now") }}";
 
 // Enable logging to syslog. Default is False
-Unattended-Upgrade::SyslogEnable "{{ unattended_syslog_enable | to_json }}";
+Unattended-Upgrade::SyslogEnable "{{ unattended_syslog_enable | default(false) | to_json }}";
 
 // Specify syslog facility. Default is daemon
-Unattended-Upgrade::SyslogFacility "{{ unattended_syslog_facility }}";
+Unattended-Upgrade::SyslogFacility "{{ unattended_syslog_facility | default("daemon") }}";