Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing minor issues in passenger and nginx

- bump passenger versions to 2.2.8 in apache2 and nginx cookbooks for
passenger.
- restart nginx service immediately on mime.types update
- compile nginx before installing passenger
- check that nginx binary supports the current passenger version
- restart on binary recompile or passenger config change.
  • Loading branch information...
commit bee1c875608b49b8e5ab9dab6260947584d34456 1 parent 85d81a3
@jtimberman jtimberman authored
View
2  nginx/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and configures nginx"
-version "0.9"
+version "0.10"
%w{ ubuntu debian }.each do |os|
supports os
View
2  nginx/recipes/source.rb
@@ -95,5 +95,5 @@
owner "root"
group "root"
mode "0644"
- notifies :restart, resources(:service => "nginx")
+ notifies :restart, resources(:service => "nginx"), :immediately
end
View
2  passenger_apache2/attributes/passenger.rb
@@ -1,3 +1,3 @@
-set_unless[:passenger][:version] = "2.2.5"
+set_unless[:passenger][:version] = "2.2.8"
set[:passenger][:root_path] = "#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger[:version]}"
set[:passenger][:module_path] = "#{passenger[:root_path]}/ext/apache2/mod_passenger.so"
View
2  passenger_enterprise/attributes/passenger_enterprise.rb
@@ -23,6 +23,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-set_unless[:passenger_enterprise][:version] = "2.2.5"
+set_unless[:passenger_enterprise][:version] = "2.2.8"
set_unless[:passenger_enterprise][:root_path] = "/opt/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-#{passenger_enterprise[:version]}"
set_unless[:passenger_enterprise][:module_path] = "#{passenger_enterprise[:root_path]}/ext/apache2/mod_passenger.so"
View
2  passenger_enterprise/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures Passenger under Ruby Enterprise Edition with Apache"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version "0.1"
+version "0.2"
%w{ ruby_enterprise nginx apache2 }.each do |cb|
depends cb
View
6 passenger_enterprise/recipes/nginx.rb
@@ -22,8 +22,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include_recipe "passenger_enterprise"
include_recipe "nginx::source"
+include_recipe "passenger_enterprise"
configure_flags = node[:nginx][:configure_flags].join(" ")
nginx_install = node[:nginx][:install_path]
@@ -37,7 +37,8 @@
--nginx-source-dir=/tmp/nginx-#{nginx_version} \
--extra-configure-flags='#{configure_flags}'
}
- creates "#{nginx_install}/sbin/nginx"
+ not_if "#{nginx_install}/sbin/nginx -V 2>&1 | grep '#{node[:ruby_enterprise][:gems_dir]}/gems/passenger-#{node[:passenger_enterprise][:version]}/ext/nginx'"
+ notifies :restart, resources(:service => "nginx")
end
template "#{nginx_dir}/conf.d/passenger.conf" do
@@ -45,4 +46,5 @@
owner "root"
group "root"
mode "0644"
+ notifies :restart, resources(:service => "nginx")
end

0 comments on commit bee1c87

Please sign in to comment.
Something went wrong with that request. Please try again.