Fix gpg key checking warings after f588f26

[puppet-modules/puppetlabs-apt.git] / templates / 50unattended-upgrades.erb

diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 4df0f74401f01d104115a4e74036de1c95fd9dc3..47ecb3479a1216bf23f851ac67d90d23e8689f9c 100644 (file)
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -1,5 +1,9 @@
 // Automatically upgrade packages from these (origin:archive) pairs
+<%- if @legacy_origin -%>
 Unattended-Upgrade::Allowed-Origins {
+<%- else -%>
+Unattended-Upgrade::Origins-Pattern {
+<%- end -%>
 <% @origins.each do |origin| -%>
        "<%= origin %>";
 <% end -%>
@@ -29,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 %>