passenger 4.0.10 → 4.0.13

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -0,0 +1,232 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+require 'phusion_passenger'
+require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/ruby'
+require 'phusion_passenger/platform_info/apache'
+require 'phusion_passenger/utils/ansi_colors'	
+
+module PhusionPassenger
+module PlatformInfo
+
+# Detects all possible Apache installations on the system, and presents the
+# autodetection information to the user in a friendly way. It turns out too
+# many people have multiple Apache installations on their system, but they
+# don't know about that, or they don't know how to compile against the
+# correct Apache installation. This tool helps them.
+class ApacheDetector
+	class Result
+		# These are required and are never nil.
+		attr_accessor :apxs2, :httpd, :ctl, :version, :config_file
+		# These are optional and may be nil.
+		attr_accessor :a2enmod, :a2dismod
+		# This may be nil. It depends on how well we can infer information from the config file.
+		attr_accessor :error_log
+
+		def initialize(detector)
+			@detector = detector
+		end
+
+		def report
+			log " <b>* Found Apache #{version}!</b>"
+			log "   Information:"
+			log "      apxs2          : #{apxs2}"
+			log "      Main executable: #{httpd}"
+			log "      Control command: #{ctl}"
+			log "      Config file    : #{config_file}"
+			log "      Error log file : #{error_log}"
+			log ""
+			log "   To install Phusion Passenger against this specific Apache version:"
+			log "      #{PlatformInfo.ruby_command} #{PhusionPassenger.bin_dir}/passenger-install-apache2-module --apxs2-path='#{apxs2}'"
+			log ""
+			log "   To start, stop or restart this specific Apache version:"
+			log "      #{ctl} start"
+			log "      #{ctl} stop"
+			log "      #{ctl} restart"
+			log ""
+			log "   To troubleshoot, please read the logs in this file:"
+			log "      #{error_log}"
+			log ""
+		end
+
+	private
+		def log(message)
+			@detector.send(:log, message)
+		end
+	end
+
+	def initialize(output)
+		@output  = output
+		@results = []
+		PlatformInfo.verbose = true
+		PlatformInfo.log_implementation = lambda do |message|
+			if message =~ /: found$/
+				log("<green> * #{message}</green>")
+			else
+				log(" * #{message}")
+			end
+		end
+	end
+
+	def finish
+		PlatformInfo.verbose = false
+		PlatformInfo.log_implementation = nil
+	end
+
+	def detect_all
+		log "<banner>Looking for possible Apache installations...</banner>"
+		apxses = PlatformInfo.find_all_commands("apxs2") +
+			PlatformInfo.find_all_commands("apxs")
+		apxses = remove_symlink_duplications(apxses)
+		log ""
+		apxses.each do |apxs2|
+			detect_one(apxs2)
+		end
+	end
+
+	def detect_one(apxs2)
+		log "<banner>Analyzing #{apxs2}...</banner>"
+		add_result do |result|
+			result.apxs2 = apxs2
+			log "Detecting main Apache executable..."
+			result.httpd = PlatformInfo.httpd(:apxs2 => apxs2)
+			if result.httpd
+				if result.version = PlatformInfo.httpd_version(:httpd => result.httpd)
+					log "Version detected: #{result.version}"
+				else
+					log "<red>Cannot detect version!</red>"
+					result.httpd = nil
+				end
+			end
+			if result.httpd
+				log "Detecting control command..."
+				result.ctl = PlatformInfo.apache2ctl(:apxs2 => apxs2)
+				result.httpd = nil if !result.ctl
+			end
+			if result.httpd
+				result.config_file = PlatformInfo.httpd_default_config_file(:httpd => result.httpd)
+				if result.config_file
+					log "Default config file location detected: #{result.config_file}"
+				else
+					log "<red>Cannot detect default config file location!</red>"
+					result.httpd = nil
+				end
+			end
+			if result.httpd
+				result.error_log = PlatformInfo.httpd_actual_error_log(:httpd => result.httpd)
+				if result.error_log
+					log "Error log file detected: #{result.error_log}"
+				else
+					log "<red>Cannot detect error log file!</red>"
+					result.httpd = nil
+				end
+			end
+			if result.httpd
+				if PlatformInfo.httpd_supports_a2enmod?(:httpd => result.httpd)
+					log "This Apache installation does not support a2enmod."
+				else
+					log "Detecting a2enmod and a2dismod..."
+					result.a2enmod = PlatformInfo.a2enmod(:apxs2 => apxs2)
+					result.a2dismod = PlatformInfo.a2dismod(:apxs2 => apxs2)
+				end
+			end
+			if result.httpd
+				log "<green>Found a usable Apache installation using #{apxs2}.</green>"
+				true
+			else
+				log "<yellow>Cannot find a usable Apache installation using #{apxs2}.</yellow>"
+				false
+			end
+		end
+		log ""
+	end
+
+	def report
+		log "<banner>Final autodetection results</banner>"
+		@results.each do |result|
+			result.report
+		end
+		if @results.empty?
+			log "<red>Sorry, this program cannot find an Apache installation.</red>"
+			log ""
+			log "To install Apache, please run the following. It will tell you how to install Apache."
+			log ""
+			log "   <b>#{PhusionPassenger.bin_dir}/passenger-install-apache2-module</b>"
+			log ""
+			log "If you are sure that you have Apache installed, please read the documentation:"
+			log " * <b>#{PhusionPassenger.doc_dir}/Users guide Apache.html</b>, section"
+			log "   section 'Installation' -> 'Customizing the compilation process' ->"
+			log "   'Forcing location of command line tools and dependencies'"
+			log " * Or visit the online version:"
+			log "   <b>http://www.modrails.com/documentation/Users%20guide%20Apache.html#_forcing_location_of_command_line_tools_and_dependencies</b>"
+		elsif @results.size > 1
+			log "<yellow>WARNING: You have multiple Apache installations on your system!</yellow>"
+			log "You are strongly recommended to read this section of the documentation:"
+			log " * <b>#{PhusionPassenger.doc_dir}/Users guide Apache.html</b>, section"
+			log "   section 'Installation' -> 'Customizing the compilation process' ->"
+			log "   'Forcing location of command line tools and dependencies'"
+			log " * Or visit the online version:"
+			log "   <b>http://www.modrails.com/documentation/Users%20guide%20Apache.html#_forcing_location_of_command_line_tools_and_dependencies</b>"
+		end
+	end
+
+private
+	def log(message)
+		@output.puts(Utils::AnsiColors.ansi_colorize(message))
+	end
+
+	# On Ubuntu, /usr/bin/apxs2 is a symlink to /usr/bin/apxs. We're only
+	# supposed to detect one Apache in that case so we need to resolve symlinks.
+	def remove_symlink_duplications(filenames)
+		result = []
+		symlink_files = []
+
+		filenames.each do |filename|
+			if File.symlink?(filename)
+				symlink_files << filename
+			else
+				result << filename
+			end
+		end
+
+		symlink_files.each do |filename|
+			full_filename = File.expand_path(File.readlink(filename), File.dirname(filename))
+			if result.include?(full_filename)
+				log "#{filename} is a symlink to #{full_filename}. Ignoring it."
+			else
+				result << full_filename
+			end
+		end
+
+		return result
+	end
+
+	def add_result
+		result = Result.new(self)
+		@results << result if yield(result)
+	end
+end
+
+end
+end # module Phusion Passenger

data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb

@@ -127,6 +127,10 @@ define 'rake' do
     on :mandriva do
       urpmi "rake"
     end
+    on :amazon do
+      # 'yum install rake' installs Ruby 1.9's Rake but Ruby 1.8 is the default -_-
+      gem_install 'rake'
+    end
     on :redhat do
       yum_install "rake"
     end

data/lib/phusion_passenger/platform_info/linux.rb

@@ -62,6 +62,13 @@ module PlatformInfo
 				# "Red Hat Enterprise Linux Server release 5.1 (Tikanga)"
 				return [:rhel, :redhat]
 			end
+		elsif File.exist?("/etc/system-release")
+			system_release = read_file("/etc/system-release")
+			if system_release =~ /Amazon Linux/
+				return [:amazon, :redhat]
+			else
+				return [:unknown]
+			end
 		elsif File.exist?("/etc/suse-release")
 			return [:suse]
 		elsif File.exist?("/etc/gentoo-release")

data/lib/phusion_passenger/public_api.rb

@@ -29,7 +29,8 @@ class << self
 	@@event_credentials = []
 	@@event_after_installing_signal_handlers = []
 	@@event_oob_work = []
-	
+	@@advertised_concurrency_level = nil
+
 	def on_event(name, &block)
 		callback_list_for_event(name) << block
 	end
@@ -42,11 +43,19 @@ class << self
 	
 	def install_framework_extensions!(*args)
 		require 'rails/version' if defined?(::Rails) && !defined?(::Rails::VERSION)
-		if defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
+		if defined?(::Rails) && ::Rails::VERSION::MAJOR >= 3
 			require 'phusion_passenger/rails3_extensions/init'
 			Rails3Extensions.init!(PhusionPassenger::App.options, *args)
 		end
 	end
+
+	def advertised_concurrency_level
+		@@advertised_concurrency_level
+	end
+
+	def advertised_concurrency_level=(value)
+		@@advertised_concurrency_level = value
+	end
 	
 	def benchmark(env = nil, title = "Benchmarking")
 		log = lookup_analytics_log(env)

data/lib/phusion_passenger/standalone/command.rb

@@ -187,24 +187,21 @@ private
 		@config_filename = "#{@temp_dir}/config"
 		location_config_filename = "#{@temp_dir}/locations.ini"
 		File.chmod(0755, @temp_dir)
+
+		locations_ini_fields =
+			PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS +
+			PhusionPassenger::OPTIONAL_LOCATIONS_INI_FIELDS -
+			[:agents_dir, :lib_dir]
 		
 		File.open(location_config_filename, 'w') do |f|
 			f.puts '[locations]'
 			f.puts "natively_packaged=false"
-			f.puts "bin=#{PhusionPassenger.bin_dir}"
-			if debugging?
-				f.puts "agents=#{PhusionPassenger.agents_dir}"
-			else
-				f.puts "agents=#{@runtime_dirs[:support_dir]}/agents"
+			f.puts "lib_dir=#{@runtime_locator.find_lib_dir}"
+			f.puts "agents_dir=#{@runtime_locator.find_agents_dir}"
+			locations_ini_fields.each do |field|
+				value = PhusionPassenger.send(field)
+				f.puts "#{field}=#{value}" if value
 			end
-			f.puts "libdir=#{PhusionPassenger.lib_dir}"
-			f.puts "helper_scripts=#{PhusionPassenger.helper_scripts_dir}"
-			f.puts "resources=#{PhusionPassenger.resources_dir}"
-			f.puts "includedir=#{PhusionPassenger.include_dir}"
-			f.puts "doc=#{PhusionPassenger.doc_dir}"
-			f.puts "rubylibdir=#{PhusionPassenger.ruby_libdir}"
-			f.puts "apache2_module=#{PhusionPassenger.apache2_module_path}"
-			f.puts "ruby_extension_source=#{PhusionPassenger.ruby_extension_source_dir}"
 		end
 		puts File.read(location_config_filename) if debugging?
 		
@@ -227,7 +224,7 @@ private
 		if @options[:nginx_bin]
 			nginx_bin = @options[:nginx_bin]
 		else
-			nginx_bin = "#{@runtime_dirs[:nginx_dir]}/nginx"
+			nginx_bin = @runtime_locator.find_nginx_binary
 		end
 		return "#{nginx_bin} -c '#{@config_filename}' -p '#{@temp_dir}/'"
 	end

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -27,6 +27,7 @@ require 'phusion_passenger'
 require 'phusion_passenger/abstract_installer'
 require 'phusion_passenger/packaging'
 require 'phusion_passenger/common_library'
+require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/platform_info/binary_compatibility'
 require 'phusion_passenger/standalone/utils'
@@ -35,22 +36,25 @@ require 'phusion_passenger/utils/tmpio'
 module PhusionPassenger
 module Standalone
 
-# Installs the Phusion Passenger Standalone runtime by downloading and compiling
-# Nginx, compiling the Phusion Passenger support binaries, and storing the
-# results in the designated directories. This installer is entirely
-# non-interactive.
+# Installs the Phusion Passenger Standalone runtime by downloading or compiling
+# the Phusion Passenger support binaries and Nginx, and then storing them
+# in the designated directories. This installer is entirely non-interactive.
 #
 # The following option must be given:
 # - targets: An array containing at least one of:
-#   * :nginx - to indicate that you want to compile and install Nginx.
-#   * :support_binaries - to indicate that you want to compile and install the
+#   * :support_binaries - to indicate that you want to install the
 #                         Phusion Passenger support binary files.
-#   * :ruby - to indicate that you want to compile and install the Ruby
-#             extension files.
+#   * :nginx - to indicate that you want to install Nginx.
 #
-# If 'targets' contains :nginx, then you must also specify these options:
+# If `targets` contains `:support_binaries`, then you must also specify this
+# options:
+# - support_dir: The support binary files will be installed here.
+#
+# If `targets` contains `:nginx`, then you must also specify these options:
 # - nginx_dir: Nginx will be installed into this directory.
-# - support_dir: Path to the Phusion Passenger support binary files.
+# - lib_dir: Path to the Phusion Passenger libraries, which Nginx will link to.
+#            This may be the same path as `support_dir`; Nginx will be compiled
+#            after the support binary files are installed.
 # - nginx_version (optional): The Nginx version to download. If not given then a
 #   hardcoded version number will be used.
 # - nginx_tarball (optional): The location to the Nginx tarball. This tarball *must*
@@ -58,29 +62,32 @@ module Standalone
 #   then Nginx will not be downloaded; it will be extracted from this tarball
 #   instead.
 #
-# If targets contains ':support_binaries', then you must also specify this
-# options:
-# - support_dir: The support binary files will be installed here.
-#
-# If targets contains ':ruby', then you must also specify this option:
-# - ruby_dir: The support binary files will be installed here.
-#
 # Other optional options:
 # - download_binaries: If true then RuntimeInstaller will attempt to download
-#   precompiled Nginx binaries and precompiled Phusion Passenger support binary
-#   files from the network, if they exist for the current platform. The default is
-#   false.
+#   a precompiled Nginx binary and precompiled Phusion Passenger support binaries
+#   from the network, if they exist for the current platform. The default is
+#   true. Note that binary downloading only happens when Phusion Passenger is
+#   installed from an official release package.
 # - binaries_url_root: The URL on which to look for the aforementioned binaries.
 #   The default points to the Phusion website.
-#
-# Please note that RuntimeInstaller will try to avoid compiling/installing things
-# that don't need to be compiled/installed. This is done by checking whether some
-# key files exist, and concluding that something doesn't need to be
-# compiled/installed if they do. This quick check is of course not perfect; if you
-# want to force a recompilation/reinstall then you should remove +nginx_dir+
-# and +support_dir+ before starting this installer.
 class RuntimeInstaller < AbstractInstaller
 	include Utils
+
+	def initialize(*args)
+		super(*args)
+		raise ArgumentError, "At least one target must be given" if @targets.nil? || @targets.empty?
+		if @targets.include?(:support_binaries)
+			if PhusionPassenger.natively_packaged?
+				raise ArgumentError, "You cannot specify :support_binaries as a " +
+					"target when natively packaged"
+			end
+			raise ArgumentError, ":support_dir must be given" if !@support_dir
+		end
+		if @targets.include?(:nginx)
+			raise ArgumentError, ":nginx_dir must be given" if !@nginx_dir
+			raise ArgumentError, ":lib_dir must be given" if !@lib_dir
+		end
+	end
 	
 protected
 	def dependencies
@@ -95,8 +102,6 @@ protected
 			'gcc',
 			'g++',
 			'gmake',
-			'download-tool',
-			PlatformInfo.passenger_needs_ruby_dev_header? ? 'ruby-dev' : nil,
 			'ruby-openssl',
 			'rubygems',
 			'rake',
@@ -113,133 +118,281 @@ protected
 	def users_guide
 		return "#{PhusionPassenger.doc_dir}/Users guide Standalone.html"
 	end
-	
+
 	def run_steps
-		if @support_dir && @nginx_dir
-			show_welcome_screen
-		end
-		check_dependencies(false) || exit(1)
+		show_welcome_screen if @nginx_dir
 		check_whether_os_is_broken
-		check_whether_system_has_enough_ram
+		check_for_download_tool
+		download_or_compile_binaries
 		puts
-		
-		phase = 1
-		total_phases = 0
-		
-		if binary_support_files_should_be_installed?
-			check_whether_we_can_write_to(@support_dir) || exit(1)
-			total_phases += 4
+		puts "<green><b>All done!</b></green>"
+		puts
+	end
+
+	def before_install
+		super
+		@plugin.call_hook(:runtime_installer_start, self) if @plugin
+		@working_dir = PhusionPassenger::Utils.mktmpdir("passenger.", PlatformInfo.tmpexedir)
+		@nginx_version ||= PREFERRED_NGINX_VERSION
+		@download_binaries = true if !defined?(@download_binaries)
+		@binaries_url_root ||= BINARIES_URL_ROOT
+	end
+
+	def after_install
+		super
+		FileUtils.remove_entry_secure(@working_dir) if @working_dir
+		@plugin.call_hook(:runtime_installer_cleanup) if @plugin
+	end
+
+private
+	def show_welcome_screen
+		render_template 'standalone/welcome',
+			:version => @nginx_version,
+			:dir => @nginx_dir
+		puts
+	end
+
+	def check_for_download_tool
+		puts "<banner>Checking for basic prerequities...</banner>"
+		puts
+
+		require 'phusion_passenger/platform_info/depcheck'
+		PlatformInfo::Depcheck.load('depcheck_specs/utilities')
+		runner = PlatformInfo::Depcheck::ConsoleRunner.new
+		runner.add('download-tool')
+
+		if !runner.check_all
+			@download_binaries = false
+			puts
+			line
+			puts
+			render_template 'standalone/download_tool_missing',
+				:runner => runner
+			wait
 		end
-		if ruby_extension_should_be_installed?
-			check_whether_we_can_write_to(@ruby_dir) || exit(1)
-			total_phases += 2
+	end
+
+	def download_or_compile_binaries
+		if should_install_support_binaries?
+			support_binaries_downloaded = download_support_binaries
 		end
-		if nginx_needs_to_be_installed?
-			check_whether_we_can_write_to(@nginx_dir) || exit(1)
-			total_phases += 4
+		if should_install_nginx?
+			nginx_binary_downloaded = download_nginx_binary
 		end
 		
-		if binary_support_files_should_be_installed? && should_download_binaries?
-			download_and_extract_binary_support_files(@support_dir) do |progress, total|
-				show_progress(progress, total, 1, 1, "Extracting Passenger binaries...")
+		should_compile_support_binaries = should_install_support_binaries? &&
+			!support_binaries_downloaded
+		should_compile_nginx = should_install_nginx? && !nginx_binary_downloaded
+
+		if should_compile_support_binaries || should_compile_nginx
+			if @dont_compile_runtime
+				@stderr.puts "*** ERROR: Refusing to compile the Phusion Passenger Standalone runtime " +
+					"because --no-compile-runtime is given."
+				exit(1)
 			end
+			check_dependencies(false) || exit(1)
 			puts
-			puts
-		end
-		if ruby_extension_should_be_installed? && should_download_binaries?
-			download_and_extract_ruby_extension(@ruby_dir) do |progress, total|
-				show_progress(progress, total, 1, 1, "Extracting Ruby extension...")
+			if should_compile_support_binaries
+				check_whether_we_can_write_to(@support_dir) || exit(1)
 			end
+			if should_compile_nginx
+				check_whether_we_can_write_to(@nginx_dir) || exit(1)
+			end
+		end
+
+		if should_compile_nginx
+			nginx_source_dir = download_and_extract_nginx_sources
+		end
+		if should_compile_support_binaries
+			compile_support_binaries
+		end
+		if should_compile_nginx
+			compile_nginx(nginx_source_dir)
+		end
+	end
+
+	# If this method returns true, then PhusionPassenger.originally_packaged? is also true.
+	def should_install_support_binaries?
+		return @targets.include?(:support_binaries)
+	end
+
+	def should_install_nginx?
+		return @targets.include?(:nginx)
+	end
+
+	def should_download_binaries?
+		return PhusionPassenger.installed_from_release_package? &&
+			@download_binaries &&
+			@binaries_url_root
+	end
+
+	def download_support_binaries
+		return false if !should_download_binaries?
+
+		puts "<banner>Downloading Passenger support binaries for your platform, if available...</banner>"
+		basename = "support-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
+		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
+		tarball  = "#{@working_dir}/#{basename}"
+		if !download(url, tarball, :cacert => PhusionPassenger.binaries_ca_cert_path, :use_cache => true)
+			puts "<b>No binaries are available for your platform. But don't worry, the " +
+				"necessary binaries will be compiled from source instead.</b>"
 			puts
-			puts
+			return false
+		end
+		
+		FileUtils.mkdir_p(@support_dir)
+		Dir.mkdir("#{@working_dir}/support")
+		Dir.chdir("#{@working_dir}/support") do
+			puts "Extracting tarball..."
+			return false if !extract_tarball(tarball)
+			return false if !check_support_binaries
+		end
+
+		if system("mv '#{@working_dir}/support'/* '#{@support_dir}'/")
+			return true
+		else
+			@stderr.puts "Error: could not move extracted files to the support directory"
+			return false
 		end
-		if nginx_needs_to_be_installed? && should_download_binaries?
-			download_and_extract_nginx_binaries(@nginx_dir) do |progress, total|
-				show_progress(progress, total, 1, 1, "Extracting Nginx binaries...")
+	rescue Interrupt
+		exit 2
+	end
+
+	def check_support_binaries
+		["PassengerWatchdog", "PassengerHelperAgent", "PassengerLoggingAgent"].each do |exe|
+			puts "Checking whether the downloaded #{exe} binary is usable..."
+			output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 ./agents/#{exe} --test-binary 1`
+			if !$? || $?.exitstatus != 0 || output != "PASS\n"
+				@stderr.puts "Binary #{exe} is not usable."
+				return false
 			end
+		end
+		puts "Binaries are usable."
+		return true
+	end
+
+	def download_nginx_binary
+		return false if !should_download_binaries?
+
+		puts "<banner>Downloading Nginx binary for your platform, if available...</banner>"
+		basename = "nginx-#{@nginx_version}-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
+		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
+		tarball  = "#{@working_dir}/#{basename}"
+		if !download(url, tarball, :cacert => PhusionPassenger.binaries_ca_cert_path, :use_cache => true)
+			puts "<b>No binary available for your platform. But don't worry, the " +
+				"necessary binary will be compiled from source instead.</b>"
 			puts
-			puts
+			return false
 		end
-		
-		if nginx_needs_to_be_installed?
-			nginx_source_dir = download_and_extract_nginx_sources do |progress, total|
-				show_progress(progress, total, phase, total_phases, "Extracting...")
+
+		FileUtils.mkdir_p(@nginx_dir)
+		Dir.mkdir("#{@working_dir}/nginx")
+		Dir.chdir("#{@working_dir}/nginx") do
+			puts "Extracting tarball..."
+			result = extract_tarball(tarball)
+			return false if !result
+			if check_nginx_binary
+				if system("mv '#{@working_dir}/nginx'/* '#{@nginx_dir}'/")
+					return true
+				else
+					@stderr.puts "Error: could not move extracted Nginx binary to the right directory"
+					return false
+				end
+			else
+				return false
 			end
-			phase += 1
-			if nginx_source_dir.nil?
+		end
+	rescue Interrupt
+		exit 2
+	end
+
+	def check_nginx_binary
+		puts "Checking whether the downloaded binary is usable..."
+		output = `env LD_BIND_NOW=1 DYLD_BIND_AT_LAUNCH=1 ./nginx -v 2>&1`
+		if $? && $?.exitstatus == 0 && output =~ /nginx version:/
+			puts "Binary is usable."
+			return true
+		else
+			@stderr.puts "Binary is not usable."
+			return false
+		end
+	end
+
+	def download_and_extract_nginx_sources
+		begin_progress_bar
+		puts "Downloading Nginx..."
+		if @nginx_tarball
+			tarball  = @nginx_tarball
+		else
+			basename = "nginx-#{@nginx_version}.tar.gz"
+			tarball  = "#{@working_dir}/#{basename}"
+			if !download("http://nginx.org/download/#{basename}", tarball)
 				puts
 				show_possible_solutions_for_download_and_extraction_problems
 				exit(1)
 			end
 		end
-		if ruby_extension_should_be_installed?
-			phase += install_ruby_extension do |progress, total, subphase, status_text|
-				show_progress(progress, total, phase + subphase, total_phases, status_text)
-			end
-		end
-		if binary_support_files_should_be_installed?
-			install_binary_support_files do |progress, total, subphase, status_text|
-				if subphase == 0
-					show_progress(progress, total, phase, total_phases, status_text)
-				else
-					show_progress(progress, total, phase + 1 .. phase + 3, total_phases, status_text)
+		nginx_sources_name = "nginx-#{@nginx_version}"
+		
+		Dir.chdir(@working_dir) do
+			begin_progress_bar
+			begin
+				result = extract_tarball(tarball) do |progress, total|
+					show_progress(progress / total * 0.1, 1.0, 1, 1, "Extracting Nginx sources...")
 				end
+			rescue Exception
+				puts
+				raise
 			end
-			phase += 4
-		end
-		if nginx_needs_to_be_installed?
-			install_nginx_from_source(nginx_source_dir) do |progress, total, status_text|
-				show_progress(progress, total, phase .. phase + 2, total_phases, status_text)
+			if result
+				return "#{@working_dir}/#{nginx_sources_name}"
+			else
+				puts
+				show_possible_solutions_for_download_and_extraction_problems
+				exit(1)
 			end
-			phase += 3
 		end
-		
-		puts
-		puts "<green><b>All done!</b></green>"
-		puts
-	end
-	
-	def before_install
-		super
-		@plugin.call_hook(:runtime_installer_start, self) if @plugin
-		@working_dir = PhusionPassenger::Utils.mktmpdir("passenger.", PlatformInfo.tmpexedir)
-		@download_binaries = true if !defined?(@download_binaries)
-		@binaries_url_root ||= STANDALONE_BINARIES_URL_ROOT
+	rescue Interrupt
+		exit 2
 	end
 
-	def after_install
-		super
-		FileUtils.remove_entry_secure(@working_dir) if @working_dir
-		@plugin.call_hook(:runtime_installer_cleanup) if @plugin
-	end
+	def compile_support_binaries
+		begin_progress_bar
+		show_progress(0, 1, 1, 1, "Preparing Phusion Passenger...")
+		Dir.chdir(PhusionPassenger.source_root) do
+			args = "nginx_without_native_support" +
+				" CACHING=false" +
+				" OUTPUT_DIR='#{@support_dir}'"
+			begin
+				run_rake_task!(args) do |progress, total|
+					show_progress(progress, total, 1, 1, "Compiling Phusion Passenger...")
+				end
+			ensure
+				puts
+			end
 
-private
-	def nginx_needs_to_be_installed?
-		return @targets.include?(:nginx) &&
-			!File.exist?("#{@nginx_dir}/sbin/nginx")
-	end
-	
-	def ruby_extension_should_be_installed?
-		return @targets.include?(:ruby) &&
-			!File.exist?("#{@ruby_dir}/#{PlatformInfo.ruby_extension_binary_compatibility_id}")
-	end
-	
-	def binary_support_files_should_be_installed?
-		return @targets.include?(:support_binaries) && (
-			!File.exist?("#{@support_dir}/buildout/agents/PassengerHelperAgent") ||
-			!File.exist?("#{@support_dir}/buildout/common/libpassenger_common.a")
-		)
-	end
-	
-	def should_download_binaries?
-		return @download_binaries && @binaries_url_root
+			system "rm -rf '#{@support_dir}'/agents/{*.o,*.dSYM}"
+			system "rm -rf '#{@support_dir}'/common/libboost_oxt"
+			system "rm -rf '#{@support_dir}'/*/{*.lo,*.h,*.log,Makefile,libtool,stamp-h1,config.status,.deps}"
+			system "rm -rf '#{@support_dir}'/{libeio,libev}/*.o"
+			
+			# Retain only the object files that are needed for linking the Phusion Passenger module into Nginx.
+			nginx_libs = COMMON_LIBRARY.
+				only(*NGINX_LIBS_SELECTOR).
+				set_output_dir("#{@support_dir}/libpassenger_common").
+				link_objects
+			Dir["#{@support_dir}/libpassenger_common/**/*"].each do |filename|
+				if !nginx_libs.include?(filename) && File.file?(filename)
+					File.unlink(filename)
+				end
+			end
+		end
 	end
-	
-	def show_welcome_screen
-		render_template 'standalone/welcome',
-			:version => @nginx_version,
-			:dir => @nginx_dir
-		puts
+
+	def compile_nginx(nginx_source_dir)
+		install_nginx_from_source(nginx_source_dir) do |progress, total, status_text|
+			show_progress(0.1 + progress / total.to_f * 0.9, 1.0, 1, 1, status_text)
+		end
 	end
 	
 	def check_whether_we_can_write_to(dir)
@@ -272,8 +425,17 @@ private
 			status_text)
 		text = text.ljust(max_width)
 		text = text[0 .. max_width - 1]
-		STDOUT.write("#{text}\r")
-		STDOUT.flush
+		if @stdout.tty?
+			@stdout.write("#{text}\r")
+			@stdout.flush
+		else
+			if @last_status_text != status_text
+				@last_status_text = status_text
+				@stdout.write("[#{status_text.sub(/\.*$/, '')}]")
+			end
+			@stdout.write(".")
+			@stdout.flush
+		end
 		@plugin.call_hook(:runtime_installer_progress, total_progress, status_text) if @plugin
 	end
 	
@@ -301,7 +463,7 @@ private
 				buffer = buffer.force_encoding('binary') if buffer.respond_to?(:force_encoding)
 				total_size = File.size(filename)
 				bytes_read = 0
-				yield(bytes_read, total_size)
+				yield(bytes_read, total_size) if block_given?
 				begin
 					doing_our_io = true
 					while !f.eof?
@@ -310,7 +472,7 @@ private
 						io.flush
 						bytes_read += buffer.size
 						doing_our_io = false
-						yield(bytes_read, total_size)
+						yield(bytes_read, total_size) if block_given?
 						doing_our_io = true
 					end
 				rescue Errno::EPIPE
@@ -340,9 +502,9 @@ private
 			end
 		end
 		if $?.exitstatus != 0
-			STDERR.puts
-			STDERR.puts backlog
-			STDERR.puts "*** ERROR: command failed: #{command}"
+			@stderr.puts
+			@stderr.puts backlog
+			@stderr.puts "*** ERROR: command failed: #{command}"
 			exit 1
 		end
 	end
@@ -382,148 +544,20 @@ private
 			end
 		end
 		if $?.exitstatus != 0
-			STDERR.puts
-			STDERR.puts "*** ERROR: the following command failed:"
-			STDERR.puts(backlog)
+			@stderr.puts
+			@stderr.puts "*** ERROR: the following command failed:"
+			@stderr.puts(backlog)
 			exit 1
 		end
 	end
 	
-	def download_and_extract_binary_support_files(target, &block)
-		puts "<banner>Downloading Passenger support binaries for your platform, if available...</banner>"
-		basename = "support-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
-		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
-		tarball  = "#{@working_dir}/#{basename}"
-		if !download(url, tarball)
-			puts "<b>Looks like it's not. But don't worry, the " +
-				"necessary binaries will be compiled from source instead.</b>"
-			return nil
-		end
-		
-		FileUtils.mkdir_p(target)
-		Dir.chdir(target) do
-			return extract_tarball(tarball, &block)
-		end
-	rescue Interrupt
-		exit 2
-	end
-	
-	def download_and_extract_ruby_extension(target, &block)
-		puts "<banner>Downloading Ruby extension for your Ruby and platform, if available...</banner>"
-		basename = "rubyext-#{PlatformInfo.ruby_extension_binary_compatibility_id}.tar.gz"
-		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
-		tarball  = "#{@working_dir}/#{basename}"
-		if !download(url, tarball)
-			puts "<b>Looks like it's not. But don't worry, the " +
-				"necessary binaries will be compiled from source instead.</b>"
-			return nil
-		end
-		
-		FileUtils.mkdir_p(target)
-		Dir.chdir(target) do
-			return extract_tarball(tarball, &block)
-		end
-	rescue Interrupt
-		exit 2
-	end
-	
-	def download_and_extract_nginx_binaries(target, &block)
-		puts "<banner>Downloading Nginx binaries for your platform, if available...</banner>"
-		basename = "nginx-#{@nginx_version}-#{PlatformInfo.cxx_binary_compatibility_id}.tar.gz"
-		url      = "#{@binaries_url_root}/#{PhusionPassenger::VERSION_STRING}/#{basename}"
-		tarball  = "#{@working_dir}/#{basename}"
-		if !download(url, tarball)
-			puts "<b>Looks like it's not. But don't worry, the " +
-				"necessary binaries will be compiled from source instead.</b>"
-			return nil
-		end
-
-		FileUtils.mkdir_p(target)
-		Dir.chdir(target) do
-			return extract_tarball(tarball, &block)
-		end
-	rescue Interrupt
-		exit 2
-	end
-	
-	def download_and_extract_nginx_sources(&block)
-		if @nginx_tarball
-			tarball  = @nginx_tarball
-		else
-			puts "<banner>Downloading Nginx...</banner>"
-			basename = "nginx-#{@nginx_version}.tar.gz"
-			tarball  = "#{@working_dir}/#{basename}"
-			if !download("http://nginx.org/download/#{basename}", tarball)
-				return nil
-			end
-		end
-		nginx_sources_name = "nginx-#{@nginx_version}"
-		
-		Dir.chdir(@working_dir) do
-			begin_progress_bar
-			if extract_tarball(tarball, &block)
-				return "#{@working_dir}/#{nginx_sources_name}"
-			else
-				return nil
-			end
-		end
-	rescue Interrupt
-		exit 2
-	end
-	
-	def install_ruby_extension
-		begin_progress_bar
-		yield(0, 1, 0, "Preparing Ruby extension...")
-		Dir.chdir(PhusionPassenger.source_root) do
-			run_rake_task!("native_support CACHING=false ONLY_RUBY=yes RUBY_EXTENSION_OUTPUT_DIR='#{@ruby_dir}'") do |progress, total|
-				yield(progress, total, 1, "Compiling Ruby extension...")
-			end
-			system "rm -rf '#{@ruby_dir}'/{*.log,*.o,Makefile}"
-		end
-		return 2
-	end
-	
-	def install_binary_support_files
-		begin_progress_bar
-		yield(0, 1, 0, "Preparing Phusion Passenger...")
-		Dir.chdir(PhusionPassenger.source_root) do
-			args = "nginx_without_native_support" +
-				" CACHING=false" +
-				" OUTPUT_DIR='#{@support_dir}'"
-			run_rake_task!(args) do |progress, total|
-				yield(progress, total, 1, "Compiling Phusion Passenger...")
-			end
-
-			system "rm -rf '#{@support_dir}'/agents/{*.o,*.dSYM}"
-			system "rm -rf '#{@support_dir}'/common/libboost_oxt"
-			system "rm -rf '#{@support_dir}'/*/{*.lo,*.h,*.log,Makefile,libtool,stamp-h1,config.status,.deps}"
-			system "rm -rf '#{@support_dir}'/{libeio,libev}/*.o"
-			
-			# Retain only the object files that are needed for linking the Phusion Passenger module into Nginx.
-			nginx_libs = COMMON_LIBRARY.
-				only(*NGINX_LIBS_SELECTOR).
-				set_output_dir("#{@support_dir}/libpassenger_common").
-				link_objects
-			Dir["#{@support_dir}/libpassenger_common/**/*"].each do |filename|
-				if !nginx_libs.include?(filename) && File.file?(filename)
-					File.unlink(filename)
-				end
-			end
-		end
-		return 2
-	end
-	
 	def install_nginx_from_source(source_dir)
 		require 'phusion_passenger/platform_info/compiler'
 		Dir.chdir(source_dir) do
 			shell = PlatformInfo.find_command('bash') || "sh"
 			command = ""
 			if @targets.include?(:support_binaries)
-				if ENV['PASSENGER_DEBUG'] && !ENV['PASSENGER_DEBUG'].empty?
-					output_dir = "#{PhusionPassenger.source_root}/buildout/common/libpassenger_common"
-				else
-					output_dir = "#{@support_dir}/common/libpassenger_common"
-				end
+				output_dir = "#{@support_dir}/common/libpassenger_common"
 				nginx_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
 					set_output_dir(output_dir).
 					link_objects_as_string
@@ -545,7 +579,7 @@ private
 				"--without-http_uwsgi_module " <<
 				"--with-http_gzip_static_module " <<
 				"--with-http_stub_status_module " <<
-				"'--add-module=#{PhusionPassenger.source_root}/ext/nginx'"
+				"'--add-module=#{PhusionPassenger.nginx_module_source_dir}'"
 			run_command_with_throbber(command, "Preparing Nginx...") do |status_text|
 				yield(0, 1, status_text)
 			end
@@ -562,25 +596,29 @@ private
 				end
 			end
 			if $?.exitstatus != 0
-				STDERR.puts
-				STDERR.puts "*** ERROR: unable to compile Nginx."
-				STDERR.puts backlog
+				@stderr.puts
+				@stderr.puts "*** ERROR: unable to compile Nginx."
+				@stderr.puts backlog
 				exit 1
 			end
 			
 			yield(1, 1, 'Copying files...')
 			if !system("cp -pR objs/nginx '#{@nginx_dir}/'")
-				STDERR.puts
-				STDERR.puts "*** ERROR: unable to copy Nginx binaries."
+				@stderr.puts
+				@stderr.puts "*** ERROR: unable to copy Nginx binary."
 				exit 1
 			end
-			if !system("strip '#{@nginx_dir}/nginx'")
-				STDERR.puts
-				STDERR.puts "*** ERROR: unable to strip debugging symbols from the Nginx binary."
+			if !strip_binary("#{@nginx_dir}/nginx")
+				@stderr.puts
+				@stderr.puts "*** ERROR: unable to strip debugging symbols from the Nginx binary."
 				exit 1
 			end
 		end
 	end
+
+	def strip_binary(filename)
+		return system("strip", filename)
+	end
 end
 
 end # module Standalone