Skip to content

Loading…

[COOK-1316] Added attribute for default site, added condition to commons... #10

Merged
merged 2 commits into from

3 participants

@jtimberman

@miketheman This cannot be automatically merged, indicating a conflict. Can you rebase w/ master and reapply your patch and update the pull request? Thanks!

@miketheman
Owner

This should be merge-worthy now.

@jtimberman jtimberman merged commit 2638b7b into miketheman:master
@ashmere

it looks like this merge wasn't completed on partly
recipes/commons.rb line 65 - cook-1316
-nginx_site 'default'
+nginx_site 'default' if node['nginx']['default_site_enabled']

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 1 deletion.
  1. +1 −0 README.md
  2. +1 −0 attributes/default.rb
  3. +4 −0 metadata.rb
  4. +1 −1 recipes/commons.rb
View
1 README.md
@@ -45,6 +45,7 @@ Generally used attributes. Some have platform specific values. See `attributes/d
* `node['nginx']['worker_connections']` - used for config value of `events { worker_connections }`
* `node['nginx']['server_names_hash_bucket_size']` - used for config value of `server_names_hash_bucket_size`.
* `node['nginx']['disable_access_log']` - set to true to disable the general access log, may be useful on high traffic sites.
+* `node['nginx']['default_site_enabled']` - enable the default site
### Attributes for configuring the gzip module
View
1 attributes/default.rb
@@ -64,3 +64,4 @@
default['nginx']['disable_access_log'] = false
default['nginx']['install_method'] = 'package'
+default['nginx']['default_site_enabled'] = true
View
4 metadata.rb
@@ -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"
View
2 recipes/commons.rb
@@ -62,4 +62,4 @@
mode 0644
end
-nginx_site 'default'
+nginx_site 'default' if node['nginx']['default_site_enabled']
Something went wrong with that request. Please try again.