COOK-324, update nginx attributes

msonnabaum · Jul 11, 2010 · 0aada6d · 0aada6d
1 parent 174de9a
commit 0aada6d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/nginx/attributes/default.rb b/nginx/attributes/default.rb
@@ -1,6 +1,6 @@
-set_unless[:nginx][:version]      = "0.7.67"
-set_unless[:nginx][:install_path] = "/opt/nginx-#{nginx[:version]}"
-set_unless[:nginx][:src_binary]   = "#{nginx[:install_path]}/sbin/nginx"
+default[:nginx][:version]      = "0.7.67"
+default[:nginx][:install_path] = "/opt/nginx-#{nginx[:version]}"
+default[:nginx][:src_binary]   = "#{nginx[:install_path]}/sbin/nginx"
 
 case platform
 when "debian","ubuntu"
@@ -15,18 +15,18 @@
   set[:nginx][:binary]  = "/usr/sbin/nginx"
 end
 
-set_unless[:nginx][:configure_flags] = [
+default[:nginx][:configure_flags] = [
   "--prefix=#{nginx[:install_path]}",
   "--conf-path=#{nginx[:dir]}/nginx.conf",
   "--with-http_ssl_module",
   "--with-http_gzip_static_module"
 ]
 
-set_unless[:nginx][:gzip] = "on"
-set_unless[:nginx][:gzip_http_version] = "1.0"
-set_unless[:nginx][:gzip_comp_level] = "2"
-set_unless[:nginx][:gzip_proxied] = "any"
-set_unless[:nginx][:gzip_types] = [
+default[:nginx][:gzip] = "on"
+default[:nginx][:gzip_http_version] = "1.0"
+default[:nginx][:gzip_comp_level] = "2"
+default[:nginx][:gzip_proxied] = "any"
+default[:nginx][:gzip_types] = [
   "text/plain",
   "text/html",
   "text/css",
@@ -37,8 +37,8 @@
   "text/javascript"
 ]
 
-set_unless[:nginx][:keepalive]          = "on"
-set_unless[:nginx][:keepalive_timeout]  = 65
-set_unless[:nginx][:worker_processes]   = cpu[:total]
-set_unless[:nginx][:worker_connections] = 2048
-set_unless[:nginx][:server_names_hash_bucket_size] = 64
+default[:nginx][:keepalive]          = "on"
+default[:nginx][:keepalive_timeout]  = 65
+default[:nginx][:worker_processes]   = cpu[:total]
+default[:nginx][:worker_connections] = 2048
+default[:nginx][:server_names_hash_bucket_size] = 64
diff --git a/nginx/metadata.json b/nginx/metadata.json
@@ -229,7 +229,7 @@
       ]
     },
     "license": "Apache 2.0",
-    "version": "0.14.1",
+    "version": "0.14.2",
     "maintainer": "Opscode, Inc.",
     "suggestions": {
     },

diff --git a/nginx/metadata.rb b/nginx/metadata.rb
@@ -2,7 +2,7 @@
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures nginx"
-version           "0.14.1"
+version           "0.14.2"
 
 recipe "nginx", "Installs nginx package and sets up configuration with Debian apache style with sites-enabled/sites-available"
 recipe "nginx::source", "Installs nginx from source and sets up configuration with Debian apache style with sites-enabled/sites-available"