From 31f732e7894d18a52bb11f96160dc0e0be4f35e9 Mon Sep 17 00:00:00 2001 From: Johan Fleury Date: Mon, 9 Mar 2015 00:01:57 +0100 Subject: [PATCH] Cleaning 50unattended-upgrades.erb --- templates/50unattended-upgrades.erb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb index 1177922..47ecb34 100644 --- a/templates/50unattended-upgrades.erb +++ b/templates/50unattended-upgrades.erb @@ -33,25 +33,30 @@ Unattended-Upgrade::MinimalSteps "<%= @minimal_steps %>"; // This will (obviously) make shutdown slower Unattended-Upgrade::InstallOnShutdown "<%= @install_on_shutdown %>"; +<% if @mail_to != "NONE" %> // 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. -<% if @mail_to != "NONE" %>Unattended-Upgrade::Mail "<%= @mail_to %>";<% end %> +Unattended-Upgrade::Mail "<%= @mail_to %>"; +<% end %> +<% if @mail_to != "NONE" %> // Set this value to "true" to get emails only on errors. Default // is to always send a mail if Unattended-Upgrade::Mail is set -<% if @mail_to != "NONE" %>Unattended-Upgrade::MailOnlyOnError "<%= @mail_only_on_error %>";<% end %> +Unattended-Upgrade::MailOnlyOnError "<%= @mail_only_on_error %>"; +<% end %> // Do automatic removal of new unused dependencies after the upgrade // (equivalent to apt-get autoremove) Unattended-Upgrade::Remove-Unused-Dependencies "<%= @remove_unused %>"; -// Automatically reboot *WITHOUT CONFIRMATION* if a -// the file /var/run/reboot-required is found after the upgrade +// Automatically reboot *WITHOUT CONFIRMATION* if a +// the file /var/run/reboot-required is found after the upgrade Unattended-Upgrade::Automatic-Reboot "<%= @auto_reboot %>"; - +<% if @dl_limit != "NONE" %> // Use apt bandwidth limit feature, this example limits the download // speed to 70kb/sec -<% if @dl_limit != "NONE" %>Acquire::http::Dl-Limit "<%= @dl_limit %>";<% end %> +Acquire::http::Dl-Limit "<%= @dl_limit %>"; +<% end %> -- 2.45.2