Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'phusion/master' into HEAD

  • Loading branch information...
commit e5007b97de85e80aa830e78927d9ff060a5fe268 2 parents c9446cb + 48a9851
@erikogan erikogan authored
View
2  lib/phusion_passenger/dependencies.rb
@@ -403,6 +403,8 @@ def self.asciidoc_required?
dep.install_command = "apt-get install libaprutil1-dev"
elsif tags.include?(:mandriva)
dep.install_command = "urpmi libapr-util-devel"
+ elsif tags.include?(:redhat)
+ dep.install_command = "yum install apr-util-devel"
end
elsif RUBY_PLATFORM =~ /darwin/
dep.install_instructions = "Please install Apache from MacPorts, which will " <<
View
1  lib/phusion_passenger/standalone/command.rb
@@ -171,6 +171,7 @@ def determine_various_resource_locations(create_subdirs = true)
end
def write_nginx_config_file
+ require 'phusion_passenger/platform_info/ruby'
ensure_directory_exists(@temp_dir)
File.open(@config_filename, 'w') do |f|
Please sign in to comment.
Something went wrong with that request. Please try again.