Merge pull request #87 from kisoku/master

improve defaults
sous-chefs · Aug 21, 2014 · 1376afc · 1376afc
2 parents e3436c3 + 2124815
commit 1376afc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -30,7 +30,10 @@
 default['apt']['unattended_upgrades']['enable'] = false
 default['apt']['unattended_upgrades']['update_package_lists'] = true
 # this needs a good default
-default['apt']['unattended_upgrades']['allowed_origins'] = []
+codename = node.attribute?('lsb') ? node['lsb']['codename'] : 'notlinux'
+default['apt']['unattended_upgrades']['allowed_origins'] = [
+  "#{node['platform'].capitalize} #{codename}"
+]
 default['apt']['unattended_upgrades']['package_blacklist'] = []
 default['apt']['unattended_upgrades']['auto_fix_interrupted_dpkg'] = false
 default['apt']['unattended_upgrades']['minimal_steps'] = false

diff --git a/templates/default/50unattended-upgrades.erb b/templates/default/50unattended-upgrades.erb
@@ -2,7 +2,7 @@
 Unattended-Upgrade::Allowed-Origins {
 <% unless node['apt']['unattended_upgrades']['allowed_origins'].empty? -%>
 <% node['apt']['unattended_upgrades']['allowed_origins'].each do |origin| -%>
-	<%= origin %>
+	"<%= origin %>";
 <% end -%>
 <% end -%>
 };
@@ -12,7 +12,7 @@ Unattended-Upgrade::Allowed-Origins {
 Unattended-Upgrade::Package-Blacklist {
 <% unless node['apt']['unattended_upgrades']['package_blacklist'].empty? -%>
 <% node['apt']['unattended_upgrades']['package_blacklist'].each do |package| -%>
-	<%= package %>
+	"<%= package %>";
 <% end -%>
 <% end -%>
 };