diff --git a/metadata.rb b/metadata.rb index 7523796..2281d8d 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ license "Apache 2.0" description "Installs and configures Passenger under RVM with Apache or nginx" long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.8.3" +version "0.8.4" recipe "rvm_passenger", "Installs Passenger gem with RVM" recipe "rvm_passenger::apache2", "Enables Apache module configuration for passenger under RVM" @@ -11,7 +11,8 @@ depends "rvm", ">= 0.8.0" depends "nginx", "~> 0.101.0" -depends "apache2", "~> 1.1.8" +depends "apache2", ">= 1.1.8" +depends "apache2", "< 1.7.0" supports "ubuntu" supports "debian" diff --git a/templates/default/passenger_nginx.conf.erb b/templates/default/passenger_nginx.conf.erb index 6d6731b..f8caee0 100644 --- a/templates/default/passenger_nginx.conf.erb +++ b/templates/default/passenger_nginx.conf.erb @@ -1,2 +1,2 @@ -passenger_root <%= node[:rvm_passenger][:root_path] %>; -passenger_ruby <%= node[:rvm_passenger][:ruby_wrapper] %>; +passenger_root <%= node['rvm_passenger']['root_path'] %>; +passenger_ruby <%= node['rvm_passenger']['ruby_wrapper'] %>;