Permalink
Browse files

[COOK-1316] Fixing conflicts, added metadata.rb entry for the attribute

  • Loading branch information...
1 parent 61f4d47 commit 5b5e9fe5d564afa3a71270d1a53aceb07de2e40d @miketheman miketheman committed Jun 15, 2012
Showing with 5 additions and 1 deletion.
  1. +1 −1 attributes/default.rb
  2. +4 −0 metadata.rb
View
@@ -64,4 +64,4 @@
default['nginx']['disable_access_log'] = false
default['nginx']['install_method'] = 'package'
-default['nginx']['default_site_enabled'] = true
+default['nginx']['default_site_enabled'] = true
View
@@ -89,3 +89,7 @@
attribute "nginx/disable_access_log",
:display_name => "Disable Access Log",
:default => "false"
+
+attribute "nginx/default_site_enabled",
+ :display_name => "Default site enabled",
+ :default => "true"

0 comments on commit 5b5e9fe

Please sign in to comment.