Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'COOK-1053'

  • Loading branch information...
commit 534ef62081d94720977386e23c0c1d7fc4a10937 2 parents 6f7e2ea + 63f0dbb
@jtimberman jtimberman authored
Showing with 8 additions and 6 deletions.
  1. +6 −5 nginx/attributes/default.rb
  2. +2 −1  nginx/recipes/source.rb
View
11 nginx/attributes/default.rb
@@ -20,7 +20,8 @@
# limitations under the License.
#
-default[:nginx][:version] = "1.0.12"
+default[:nginx][:version] = "1.0.12"
+default[:nginx][:url] = "http://nginx.org/download/nginx-#{node[:nginx][:version]}.tar.gz"
case platform
when "debian","ubuntu"
@@ -39,11 +40,11 @@
default[:nginx][:pid] = "/var/run/nginx.pid"
-default[:nginx][:gzip] = "on"
+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] = [
+default[:nginx][:gzip_comp_level] = "2"
+default[:nginx][:gzip_proxied] = "any"
+default[:nginx][:gzip_types] = [
"text/plain",
"text/html",
"text/css",
View
3  nginx/recipes/source.rb
@@ -32,6 +32,7 @@
end
nginx_version = node[:nginx][:version]
+src_url = node[:nginx][:url]
node.set[:nginx][:install_path] = "/opt/nginx-#{nginx_version}"
node.set[:nginx][:src_binary] = "#{node[:nginx][:install_path]}/sbin/nginx"
@@ -46,7 +47,7 @@
configure_flags = node[:nginx][:configure_flags].join(" ")
remote_file "#{Chef::Config[:file_cache_path]}/nginx-#{nginx_version}.tar.gz" do
- source "http://nginx.org/download/nginx-#{nginx_version}.tar.gz"
+ source src_url
action :create_if_missing
end
Please sign in to comment.
Something went wrong with that request. Please try again.