use nginx upstream if there is a version specified

phunehehe · Oct 22, 2014 · c99d44c · c99d44c
1 parent 1cfb7b9
commit c99d44c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/nginx/attributes/default.rb b/nginx/attributes/default.rb
@@ -59,16 +59,9 @@
 when 'ubuntu'
     default['nginx']['user'] = 'www-data'
     default['nginx']['init_style'] = 'runit'
-    if node[:platform_version].to_f >= 12.04
-        default[:nginx][:types_hash_max_size] = 2048
-    end
-    default['nginx']['version'] = '1.1'
-    default['nginx']['repo_version'] = '1.1'
 when 'redhat','centos','scientific','amazon','oracle','fedora'
     default['nginx']['user']       = 'nginx'
     default['nginx']['init_style'] = 'init'
-    default['nginx']['version'] = '1.0'
-    default['nginx']['repo_version'] = '1.0'
 else
     raise NotImplemented
 end
diff --git a/nginx/recipes/default.rb b/nginx/recipes/default.rb
@@ -3,10 +3,8 @@
     include_recipe 'yum::epel'
 end
 
-version = node[:nginx][:version]
-
-# Use upstream repo if desired version doesn't match distro provided version:
-if version != node[:nginx][:repo_version]
+# Use upstream repo if a version is specified
+if node[:nginx][:version]
     case node[:platform_family]
     when 'rhel'
         include_recipe 'nginx::upstream_redhat'
@@ -21,7 +19,9 @@
     # is already installed. :upgrade may cause some subtle problems but I guess
     # it's OK for now.
     action :upgrade
-    version node[:nginx][:version]
+    if node[:nginx][:version]
+        version node[:nginx][:version]
+    end
 end
 
 include_recipe 'nginx::commons'