passenger 4.0.33 → 4.0.34

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjJhYjliOWQ0ZTA5ZGVlZmYyOGYzZmI3OGZjNDE2ZjY5Mzg5ZjQ2Mw==
+  data.tar.gz: !binary |-
+    MWJkNzVhNWVhOTQ5NDllZDcwMTRiNzNiZjcwZmQ5OTI1MjBiYWIzMA==
+SHA512:
+  metadata.gz: !binary |-
+    YzMxMmQxMzkwNGM4ODBiYWYzMWNiZGNkY2M2ZDg2ZGU1MGUxODNkNTA5YmNm
+    YTgzOTI0NDQ5YzRjMWI3ZDE5YjE5YzI5NTIzYTYyMzA0YzhiNGU1YjdhNjBl
+    NGQ5ODY0N2EwZWFlNDk5NWMyMmI3ODZjZTIzYTEwYmY1NjNiNjU=
+  data.tar.gz: !binary |-
+    MTY0YTUxMjdhZmFiMDc0YzAzZGY3YjY3ZjVlYWMxN2ZlZjk3MGZmZWVjNmFk
+    ZTA5NDQwYjU1ODczZmQ2NDhjMmU3NGEwN2Y5MzZmMTM4YzkwOWE4ZDdhNDVl
+    OThmYzdiNjAyZjhmMDI2ODMxNmFmODk3NTQzYmI4ZDRiNzM4ZGY=

checksums.yaml.gz.asc

@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQEcBAABAgAGBQJS1vGUAAoJECrHRaUKISqMkX8IAK95IieSbNT29p85XwYr1H83
+GItWs0fCk1QD36B/W8pu0PuXXm0ImeicGSI2arI5jzGdlX0KOrKyD+78R0hT23TN
+cbvi7HflwdDDxxDEMpmhEML5tJZYKWmv0A729NVoNbP6jSEs8upUjxZJcQfrKFFL
+YEoBwdU7YX2Z8a1XD5mr60XXSHyvJ2chFqTWlvODrIeQqAk8FuJgPEA+x9eV5pxb
+JLKIcZY7FPwSJFsFHkG2395MZcdphQl2xQ63yzO9lL6ncYkCWlM8djFKzekoThlf
+tMSJjnmw08pKCMvk19i0ASSoNuFdHHwORWY9s4A08o2ZiAVf9Edv9PvYXBpmV0Q=
+=8Sfb
+-----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSxXh6AAoJECrHRaUKISqMPwMH/j/0ykK8uEZ7k7sGv9Ch/aYX
-TCPIgAwnnT1fckLnlKgMrPuLVos2BtMbCTD8gc0MWI2EYCI9JlQsrcgpWU9qAKEI
-JUGiwxVS9D0YbVFhdfSkqzeDu3VzNHCLB57OzRZr32ICCM6bOqkXcmrQ4gbMvk3Q
-dzDnESAbOybGNZ5PLQj5PXgNY6BWPt9FFrZ0zbM8CLLo3Jyk0t2+XEhknvLRrJYs
-M/kNcrrRCxXFiXYygCalsGHySmyYUumC5eZlkiPTfiaVMQBc6sZ2ZAROVSn2OUt+
-6aISpr4WR2Nk2pvhkxIWUjyZL9BP/H44I/v7rDVwSF4Iz3P32YRV0x1XkttuNYg=
-=GZg/
+iQEcBAABAgAGBQJS1vGUAAoJECrHRaUKISqM1zsIAIQfj5kkFgjPlMRhI+KaHbk1
+7fhcnu1HiuxJxy5h0egMm7FKm53/6MigQk2jwzjL30MKmGAgGNcYKAHz5DNImqwK
+fX/j8LIiUaxCJZkyxsMWseZmX+nL40lMlIu30PTpAWBJeFOsF9r/XL2b8JmofAKV
+1NjrSOi7vZh9MUIts0VmDc1D06ZJJgoWC1HvTqHuDG2E7EOcxATMBJ5zF1taDRx/
+nTFfLBhEUplByOcnFYMIasZl+3uVoije+Hzk5qOC9+LhBo4bSqXsp3g8PO5BVkok
+ysqD05YYWw/+EwfZSZuYWTofddAZPGSfavp8GNTl+ZMyIzSuwfx+SoCl3sCix9M=
+=NIdk
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,63 @@
+Release 4.0.34
+--------------
+
+ * The Node.js loader code now sets the `isApplicationLoader` attribute on the
+   bootstrapping module. This provides a way for apps and frameworks that check
+   for `module.parent` to check whether the current file is loaded by Phusion
+   Passenger, or by other software that work in a similar way.
+
+   This change has been introduced to solve a compatibility issue with CompoundJS.
+   CompoundJS users should modify their server.js, and change the following:
+
+       if (!module.parent) {
+
+   to:
+
+       if (!module.parent || module.parent.isApplicationLoader) {
+
+ * Improved support for Meteor in development mode. Terminating Phusion Passenger
+   now leaves less garbage Meteor processes behind.
+ * It is now possible to disable the usage of the Ruby native extension by setting
+   the environment variable `PASSENGER_USE_RUBY_NATIVE_SUPPORT=0`.
+ * Fixed incorrect detection of the Apache MPM on Ubuntu 13.10.
+ * When using RVM, if you set PassengerRuby/passenger_ruby to the raw Ruby binary
+   instead of the wrapper script, Phusion Passenger will now print an error.
+ * Added support for RVM >= 1.25 wrapper scripts.
+ * Fixed loading passenger_native_support on Ruby 1.9.2.
+ * The Union Station analytics code now works even without native_support.
+ * Fixed `passenger-install-apache2-module` and `passenger-install-nginx-module` in
+   Homebrew.
+ * Binaries are now downloaded from an Amazon S3 mirror if the main binary server
+   is unavailable.
+ * And finally, although this isn't really a change in 4.0.34, it should be noted.
+   In version 4.0.33 we changed the way Phusion Passenger's own Ruby source files
+   are loaded, in order to fix some Debian and RPM packaging issues. The following
+   doesn't work anymore:
+
+       require 'phusion_passenger/foo'
+
+   Instead, it should become:
+
+       PhusionPassenger.require_passenger_lib 'foo'
+
+   However, we overlooked the fact that this change breaks Ruby apps which use
+   our Out-of-Band GC feature, because such apps had to call
+   `require 'phusion_passenger/rack/out_of_band_gc'`. Unfortunately we're not able
+   to maintain compatibility without reintroducing the Debian and RPM packaging
+   issues. Users should modify the following:
+
+       require 'phusion_passenger/rack/out_of_band_gc'
+
+   to:
+
+       if PhusionPassenger.respond_to?(:require_passenger_lib)
+         # Phusion Passenger >= 4.0.33
+         PhusionPassenger.require_passenger_lib 'rack/out_of_band_gc'
+       else
+         # Phusion Passenger < 4.0.33
+         require 'phusion_passenger/rack/out_of_band_gc'
+       end
+
 Release 4.0.33
 --------------
 

data/bin/passenger-config

@@ -33,5 +33,5 @@ require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 
 PhusionPassenger.locate_directories
-PhusionPassenger.require_passenger_lib 'config'
+PhusionPassenger.require_passenger_lib 'config/main'
 PhusionPassenger::Config.run!(ARGV)

data/bin/passenger-install-apache2-module

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -52,7 +53,12 @@ PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	TerminalChoiceMenu = PhusionPassenger::Utils::TerminalChoiceMenu
-	
+
+	AUTOINSTALL_BEGIN_LOAD_BLOCK = "### Begin automatically installed #{PROGRAM_NAME} load snippet ###"
+	AUTOINSTALL_END_LOAD_BLOCK   = "### End automatically installed #{PROGRAM_NAME} load snippet ###"
+	AUTOINSTALL_BEGIN_CONF_BLOCK = "### Begin automatically installed #{PROGRAM_NAME} config snippet ###"
+	AUTOINSTALL_END_CONF_BLOCK   = "### End automatically installed #{PROGRAM_NAME} config snippet ###"
+
 	def dependencies
 		specs = [
 			'depcheck_specs/compiler_toolchain',
@@ -102,7 +108,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 	end
 	
 	def run_steps
-		if PhusionPassenger.natively_packaged?
+		if PhusionPassenger.natively_packaged? && PhusionPassenger.apache2_module_source_dir.nil?
 			if apache_module_available?
 				notify_apache_module_installed
 				show_deployment_example
@@ -112,7 +118,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 			exit
 		end
 		
-		Dir.chdir(PhusionPassenger.source_root)
+		Dir.chdir(PhusionPassenger.apache2_module_source_dir)
 		show_welcome_screen
 		query_interested_languages
 		check_gem_install_permission_problems || exit(1)
@@ -123,8 +129,9 @@ class Installer < PhusionPassenger::AbstractInstaller
 		check_whether_os_is_broken
 		check_whether_system_has_enough_ram
 		check_write_permission_to_passenger_root || exit(1)
-		if install_apache2_module
-			show_apache2_config_snippets
+		check_write_permission_to_web_server_config_files || exit(1)
+		if compile_apache2_module
+			install_apache2_config_snippets || exit(1)
 			show_deployment_example
 		else
 			show_possible_solutions_for_compilation_and_installation_problems
@@ -150,6 +157,7 @@ private
 		puts
 		if interactive?
 			puts "Use <space> to select."
+			puts "<dgray>If the menu doesn't display correctly, ensure that your terminal supports UTF-8.</dgray>"
 		else
 			puts "Override selection with --languages."
 		end
@@ -188,13 +196,12 @@ private
 			detector.report
 			@apache2 = detector.result_for(PlatformInfo.apxs2)
 			if @apache2.nil?
-				# Yes this can happen (see https://groups.google.com/forum/#!topic/phusion-passenger/JcUJOBzILB4)
-				# but I have no idea how and why. I need people who can help me reproduce this.
-				# Until then, let's output an error.
-				raise "An internal error occurred. No information detected for #{PlatformInfo.apxs2} " +
-					"(@apache2 is nil). Please contact this program's authors for support, and please " +
-					"attach the full output of this installer, as well as the full output of the command " +
-					"'passenger-config --detect-apache2'."
+				render_template 'apache2/apache_install_broken',
+					:apxs2 => PlatformInfo.apxs2,
+					:sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
+					:ruby => PhusionPassenger::PlatformInfo.ruby_command,
+					:passenger_config => "#{PhusionPassenger.bin_dir}/passenger-config"
+				return false
 			end
 			if detector.results.size > 1
 				other_installs = detector.results - [@apache2]
@@ -214,8 +221,10 @@ private
 					return result
 				else
 					puts '<yellow>Continuing installation because --auto is given.</yellow>'
+					return true
 				end
 			else
+				puts '<green>All good!</green>'
 				return true
 			end
 		ensure
@@ -230,7 +239,7 @@ private
 		# ...
 		# Server compiled with....
 		#  -D APACHE_MPM_DIR="server/mpm/prefork"
-		output = `#{PlatformInfo.httpd} -V`
+		output = PlatformInfo.httpd_V
 		output =~ /^Server MPM: +(.*)$/
 		if $1
 			mpm = $1.downcase
@@ -257,10 +266,12 @@ private
 		puts
 		line
 		if Process.uid == 0
-			render_template 'apache2/no_write_permission_to_passenger_root'
+			render_template 'installer_common/cannot_access_files_as_root',
+				:type => "directory",
+				:files => [PhusionPassenger.apache2_module_source_dir]
 		else
 			render_template 'installer_common/run_installer_as_root',
-				:dir  => PhusionPassenger.source_root,
+				:dir  => PhusionPassenger.apache2_module_source_dir,
 				:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
 				:sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
 				:ruby => PhusionPassenger::PlatformInfo.ruby_command,
@@ -270,41 +281,489 @@ private
 	ensure
 		File.unlink("__test__.txt") rescue nil
 	end
+
+	def check_write_permission_to_web_server_config_files
+		return true if !@update_config
+		config_file = PlatformInfo.httpd_default_config_file
+		return if !config_file || !File.exist?(config_file)
+
+		all_config_files = PlatformInfo.httpd_included_config_files(config_file)
+		if all_config_files[:unreadable_files].any?
+			puts
+			line
+			if Process.uid == 0
+				render_template 'installer_common/cannot_access_files_as_root',
+					:access => "read from",
+					:files => all_config_files[:unreadable_files]
+			else
+				render_template 'installer_common/run_installer_as_root',
+					:access => "read from",
+					:desc => "an Apache configuration file",
+					:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
+					:sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
+					:ruby => PhusionPassenger::PlatformInfo.ruby_command,
+					:installer => "#{PhusionPassenger.bin_dir}/passenger-install-apache2-module #{ORIG_ARGV.join(' ')}"
+			end
+			puts
+			render_template 'apache2/present_choice_for_no_update_config'
+			return false
+		end
+
+		unwriteable_files = []
+		all_config_files[:files].each do |filename|
+			if !File.writable_real?(filename)
+				unwriteable_files << filename
+			end
+		end
+		if unwriteable_files.empty?
+			return true
+		else
+			puts
+			line
+			if Process.uid == 0
+				render_template 'installer_common/cannot_access_files_as_root',
+					:files => unwriteable_files
+			else
+				render_template 'installer_common/run_installer_as_root',
+					:desc => "an Apache configuration file",
+					:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
+					:sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
+					:ruby => PhusionPassenger::PlatformInfo.ruby_command,
+					:installer => "#{PhusionPassenger.bin_dir}/passenger-install-apache2-module #{ORIG_ARGV.join(' ')}"
+			end
+			puts
+			render_template 'apache2/present_choice_for_no_update_config'
+			return false
+		end
+	end
 	
-	def install_apache2_module
+	def compile_apache2_module
 		puts
 		line
 		puts '<banner>Compiling and installing Apache 2 module...</banner>'
-		puts "cd #{PhusionPassenger.source_root}"
-		if ENV['TRACE']
-			puts "#{PlatformInfo.rake_command} --trace apache2:clean apache2 RELEASE=yes"
-			return sh("#{PlatformInfo.rake_command} --trace apache2:clean apache2 RELEASE=yes")
+		if @compile
+			puts "cd #{PhusionPassenger.apache2_module_source_dir}"
+			if ENV['TRACE']
+				rake = "#{PlatformInfo.rake_command} --trace RELEASE=yes"
+			else
+				rake = "#{PlatformInfo.rake_command} RELEASE=yes"
+			end
+			command = "#{rake} apache2:clean apache2"
+			if PhusionPassenger.native_packaging_method == "homebrew"
+				# Running apache2:clean deletes some object files needed
+				# by passenger-install-nginx-module, so we ensure those
+				# object files are compiled.
+				command << " nginx"
+			end
+			return sh(command)
 		else
-			puts "#{PlatformInfo.rake_command} apache2:clean apache2 RELEASE=yes"
-			return sh("#{PlatformInfo.rake_command} apache2:clean apache2 RELEASE=yes")
+			puts "Skipping compilation"
+			return true
 		end
 	end
 	
-	def show_apache2_config_snippets(bare = false)
-		if bare
-			puts "LoadModule passenger_module #{PhusionPassenger.apache2_module_path}"
-			puts "PassengerRoot #{PhusionPassenger.source_root}"
-			puts "PassengerDefaultRuby #{PlatformInfo.ruby_command}"
+	def load_snippet
+		return "LoadModule passenger_module #{PhusionPassenger.apache2_module_path}"
+	end
+
+	def config_snippet
+		return "<IfModule mod_passenger.c>\n" +
+			"  PassengerRoot #{PhusionPassenger.source_root}\n" +
+			"  PassengerDefaultRuby #{PlatformInfo.ruby_command}\n" +
+			"</IfModule>"
+	end
+
+	def apache2_config_snippets
+		return "#{load_snippet}\n#{config_snippet}\n"
+	end
+
+	def backup_config_files(config_file, all_config_files)
+		now = Time.now.strftime("%Y-%m-%d-%H:%M:%S")
+		archive = "#{config_file}.#{GLOBAL_NAMESPACE_DIRNAME}-backup-#{now}.tar.gz"
+		backup_files = all_config_files.dup
+
+		# Some people create a regular file in /etc/apache2/mods-enabled, for convenience
+		# reasons. This file is not actually managed by a2enmod. We will remove such files
+		# because we're going to use mods-eanbled ourselves, so we need to back them up.
+		if (dir = PlatformInfo.httpd_mods_enabled_directory) && PlatformInfo.a2enmod
+			if File.file?("#{dir}/#{APACHE2_MODULE_CONF_NAME}.load")
+				backup_files << "#{dir}/#{APACHE2_MODULE_CONF_NAME}.load"
+			end
+			if File.file?("#{dir}/#{APACHE2_MODULE_CONF_NAME}.conf")
+				backup_files << "#{dir}/#{APACHE2_MODULE_CONF_NAME}.conf"
+			end
+		end
+
+		puts "Backing up existing configuration files to #{archive}..."
+		backup_files.uniq!
+		backup_files.map! { |x| x.sub(/^\//, '') }
+		Dir.chdir("/") do
+			sh! "tar", "-czf", archive, *backup_files
+		end
+	end
+
+	def uninstall_or_comment_out_existing_config_snippets(all_config_files)
+		files_containing_autoinstall_load_blocks = []
+		files_containing_autoinstall_conf_blocks = []
+
+		# Some people create a regular file in /etc/apache2/mods-enabled, for convenience
+		# reasons. This file is not actually managed by a2enmod. We remove such files
+		# because we're going to use mods-enabled ourselves. They've already been backed up.
+		if (dir = PlatformInfo.httpd_mods_enabled_directory) && PlatformInfo.a2enmod
+			filename = "#{dir}/#{APACHE2_MODULE_CONF_NAME}.load"
+			if File.file?(filename) && !File.symlink?(filename)
+				puts "Removing #{filename}"
+				File.unlink(filename)
+			end
+			filename = "#{dir}/#{APACHE2_MODULE_CONF_NAME}.conf"
+			if File.file?(filename) && !File.symlink?(filename)
+				puts "Removing #{filename}"
+				File.unlink(filename)
+			end
+		end
+
+		# Uncomment Phusion Passenger config snippets.
+		all_config_files.each do |filename|
+			next if !File.exist?(filename)
+
+			contents = File.open(filename, "rb") do |f|
+				f.read
+			end
+			if contents =~ /#{Regexp.escape AUTOINSTALL_BEGIN_LOAD_BLOCK}.*?#{Regexp.escape AUTOINSTALL_END_LOAD_BLOCK}/m
+				files_containing_autoinstall_load_blocks << filename
+			end
+			if contents =~ /#{Regexp.escape AUTOINSTALL_BEGIN_CONF_BLOCK}.*?#{Regexp.escape AUTOINSTALL_END_CONF_BLOCK}/m
+				files_containing_autoinstall_conf_blocks << filename
+			end
+			subst1 = contents.gsub!(/^([ \t]*LoadModule[ \t]+passenger_module[ \t]+.*)$/i, '# \1')
+			subst2 = contents.gsub!(/^([ \t]*PassengerRoot[ \t]+.*)$/i, '# \1')
+			subst3 = contents.gsub!(/^([ \t]*PassengerDefaultRuby[ \t]+.*)$/i, '# \1')
+			if subst1 || subst2 || subst3
+				puts "Uninstalling previous #{PROGRAM_NAME} from #{filename}..."
+				File.open(filename, "wb") do |f|
+					f.write(contents)
+				end
+			end
+		end
+
+		# If there are multiple auto-install comment blocks, remove the duplicates.
+		# First, we remove all comment blocks from all files besides the first one.
+		if files_containing_autoinstall_load_blocks.size > 1
+			files_containing_autoinstall_load_blocks[1..-1].each do |filename|
+				puts "Removing duplicate load snippets from #{filename}..."
+				remove_comment_blocks(filename,
+					AUTOINSTALL_BEGIN_LOAD_BLOCK,
+					AUTOINSTALL_END_LOAD_BLOCK)
+			end
+		end
+		if files_containing_autoinstall_conf_blocks.size > 1
+			files_containing_autoinstall_conf_blocks[1..-1].each do |filename|
+				puts "Removing duplicate conf snippets from #{filename}..."
+				remove_comment_blocks(filename,
+					AUTOINSTALL_BEGIN_CONF_BLOCK,
+					AUTOINSTALL_END_CONF_BLOCK)
+			end
+		end
+
+		# Then we are left with exactly 0 or exactly 1 file with comment blocks
+		# of each type. There may be duplicates inside that single file, so
+		# remove duplicates there too.
+		if files_containing_autoinstall_load_blocks.size > 0
+			filename = files_containing_autoinstall_load_blocks[0]
+			puts "Removing duplicate load snippets inside #{filename}..."
+			remove_duplicate_comment_blocks(filename,
+				AUTOINSTALL_BEGIN_LOAD_BLOCK,
+				AUTOINSTALL_END_LOAD_BLOCK)
+		end
+		if files_containing_autoinstall_conf_blocks.size > 0
+			filename = files_containing_autoinstall_conf_blocks[0]
+			puts "Removing duplicate configuration snippets inside #{filename}..."
+			remove_duplicate_comment_blocks(filename,
+				AUTOINSTALL_BEGIN_CONF_BLOCK,
+				AUTOINSTALL_END_CONF_BLOCK)
+		end
+
+		# One or more files may have been removed, so filter out the ones
+		# that are left.
+		all_config_files.reject! do |filename|
+			!File.exist?(filename)
+		end
+	end
+
+	def remove_comment_blocks(filename, begin_marker, end_marker)
+		contents = File.open(filename, "rb") do |f|
+			f.read
+		end
+		regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}\n?/m
+		contents.gsub!(regexp, '')
+		File.open(filename, "wb") do |f|
+			f.write(contents)
+		end
+	end
+
+	def remove_duplicate_comment_blocks(filename, begin_marker, end_marker)
+		contents = File.open(filename, "rb") do |f|
+			f.read
+		end
+		regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}\n?/m
+		if m = regexp.match(contents)
+			offset = m.end(0)
+			rest = contents.slice!(m.end(0) .. -1)
+			rest.gsub!(regexp, '')
+			contents << rest
+			File.open(filename, "wb") do |f|
+				f.write(contents)
+			end
+		end
+	end
+
+	def add_new_config_snippets(all_config_files)
+		# Look for the file containing the auto-install load and conf comment blocks.
+		# The uninstall_or_comment_out_existing_config_snippets method has already
+		# guaranteed that there is at most 1 file per comment block type, and that
+		# inside each file there are no duplicate comment blocks.
+		load_block_file = find_config_file_containing_comment_block(all_config_files,
+			AUTOINSTALL_BEGIN_LOAD_BLOCK,
+			AUTOINSTALL_END_LOAD_BLOCK)
+		conf_block_file = find_config_file_containing_comment_block(all_config_files,
+			AUTOINSTALL_BEGIN_CONF_BLOCK,
+			AUTOINSTALL_END_CONF_BLOCK)
+		if load_block_file && conf_block_file
+			puts "Updating #{PROGRAM_NAME} module load snippet inside #{load_block_file}..."
+			update_comment_block(load_block_file,
+				AUTOINSTALL_BEGIN_LOAD_BLOCK,
+				AUTOINSTALL_END_LOAD_BLOCK,
+				load_snippet)
+			puts "Updating #{PROGRAM_NAME} configuration snippet inside #{conf_block_file}..."
+			update_comment_block(conf_block_file,
+				AUTOINSTALL_BEGIN_CONF_BLOCK,
+				AUTOINSTALL_END_CONF_BLOCK,
+				config_snippet)
+		elsif !load_block_file && !conf_block_file
+			create_load_snippet_file(:maybe_in_mods_available)
+			create_conf_snippet_file(:maybe_in_mods_available)
+			if PlatformInfo.httpd_mods_available_directory && PlatformInfo.a2enmod
+				sh! "#{PlatformInfo.a2enmod} #{APACHE2_MODULE_CONF_NAME}"
+			end
+		# It looks like either the load or conf file isn't available.
+		# If the file that is available is inside mods-available, then it
+		# means that the mods-available files are broken.
+		elsif is_file_inside_mods_available?(load_block_file, "#{APACHE2_MODULE_CONF_NAME}.load") ||
+		      is_file_inside_mods_available?(conf_block_file, "#{APACHE2_MODULE_CONF_NAME}.conf")
+			# We fix it if a2enmod is available. Otherwise, we remove the block.
+			if PlatformInfo.a2enmod
+				if !load_block_file
+					create_load_snippet_file(:must_be_in_mods_available)
+				else
+					create_conf_snippet_file(:must_be_in_mods_available)
+				end
+			else
+				if load_block_file
+					puts "Removing load snippets from #{filename}..."
+					remove_comment_blocks(load_block_file,
+						AUTOINSTALL_BEGIN_LOAD_BLOCK,
+						AUTOINSTALL_END_LOAD_BLOCK)
+				else
+					puts "Removing configuration snippets from #{filename}..."
+					remove_comment_blocks(conf_block_file,
+						AUTOINSTALL_BEGIN_CONF_BLOCK,
+						AUTOINSTALL_END_CONF_BLOCK)
+				end
+				create_load_snippet_file(:must_be_in_mods_available)
+				create_conf_snippet_file(:must_be_in_mods_available)
+			end
+			sh! "#{PlatformInfo.a2enmod} passenger"
 		else
-			puts
-			line
-			render_template 'apache2/config_snippets',
-				:module_location => PhusionPassenger.apache2_module_path,
-				:passenger_root => PhusionPassenger.source_root,
-				:ruby => PlatformInfo.ruby_command
-			if PhusionPassenger.originally_packaged?
-				wait
+			if !load_block_file
+				create_load_snippet_file(:not_in_mods_available)
+				puts "Updating #{PROGRAM_NAME} configuration snippet inside #{conf_block_file}..."
+				update_comment_block(conf_block_file,
+					AUTOINSTALL_BEGIN_CONF_BLOCK,
+					AUTOINSTALL_END_CONF_BLOCK,
+					config_snippet)
 			else
-				wait(10)
+				create_conf_snippet_file(:not_in_mods_available)
+				puts "Updating #{PROGRAM_NAME} module load snippet inside #{load_block_file}..."
+				update_comment_block(load_block_file,
+					AUTOINSTALL_BEGIN_LOAD_BLOCK,
+					AUTOINSTALL_END_LOAD_BLOCK,
+					load_snippet)
 			end
 		end
 	end
-	
+
+	def find_config_file_containing_comment_block(all_config_files, begin_marker, end_marker)
+		regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}/m
+		all_config_files.each do |filename|
+			contents = File.open(filename, "rb") do |f|
+				f.read
+			end
+			if contents =~ regexp
+				return filename
+			end
+		end
+		return nil
+	end
+
+	def update_comment_block(filename, begin_marker, end_marker, block_contents)
+		regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}\n?/m
+		contents = File.open(filename, "rb") do |f|
+			f.read
+		end
+		if contents.sub!(regexp, "#{begin_marker}\n#{block_contents}\n#{end_marker}\n")
+			File.open(filename, "wb") do |f|
+				f.write(contents)
+			end
+			return true
+		else
+			return false
+		end
+	end
+
+	def remove_comment_blocks(filename, begin_marker, end_marker)
+		regexp = /#{Regexp.escape begin_marker}.*?#{Regexp.escape end_marker}\n?/m
+		contents = File.open(filename, "rb") do |f|
+			f.read
+		end
+		contents.gsub!(regexp, "")
+		File.open(filename, "wb") do |f|
+			f.write(contents)
+		end
+	end
+
+	def is_file_inside_mods_available?(filename, basename)
+		if dir = PlatformInfo.httpd_mods_available_directory
+			return filename == "#{dir}/#{basename}"
+		else
+			return false
+		end
+	end
+
+	def create_load_snippet_file(where)
+		case where
+		when :maybe_in_mods_available
+			if PlatformInfo.httpd_mods_available_directory && PlatformInfo.a2enmod
+				filename = "#{PlatformInfo.httpd_mods_available_directory}/#{APACHE2_MODULE_CONF_NAME}.load"
+			else
+				filename = PlatformInfo.httpd_default_config_file
+			end
+		when :must_be_in_mods_available
+			if PlatformInfo.httpd_mods_available_directory && PlatformInfo.a2enmod
+				filename = "#{PlatformInfo.httpd_mods_available_directory}/#{APACHE2_MODULE_CONF_NAME}.load"
+			else
+				raise "Apache does not support the mods-available directory"
+			end
+		when :not_in_mods_available
+			filename = PlatformInfo.httpd_default_config_file
+		else
+			raise ArgumentError
+		end
+
+		if File.exist?(filename)
+			# If this is a file inside mods-available, and the file didn't have a symlink
+			# in mods-enabled, then the uninstall phase did not remove duplicates from this
+			# file. So here we remove duplicates again.
+			puts "Removing duplicate load snippets inside #{filename}..."
+			remove_duplicate_comment_blocks(filename,
+				AUTOINSTALL_BEGIN_LOAD_BLOCK,
+				AUTOINSTALL_END_LOAD_BLOCK)
+
+			puts "Installing #{PROGRAM_NAME} module load snippet to #{filename}..."
+			should_add = !update_comment_block(filename,
+				AUTOINSTALL_BEGIN_LOAD_BLOCK,
+				AUTOINSTALL_END_LOAD_BLOCK,
+				load_snippet)
+		else
+			puts "Installing #{PROGRAM_NAME} module load snippet to #{filename}..."
+			should_add = true
+		end
+		if should_add
+			File.open(filename, "ab") do |f|
+				f.write("\n#{AUTOINSTALL_BEGIN_LOAD_BLOCK}\n" +
+					"#{load_snippet}\n" +
+					"#{AUTOINSTALL_END_LOAD_BLOCK}\n")
+			end
+		end
+	end
+
+	def create_conf_snippet_file(where)
+		case where
+		when :maybe_in_mods_available
+			if PlatformInfo.httpd_mods_available_directory && PlatformInfo.a2enmod
+				filename = "#{PlatformInfo.httpd_mods_available_directory}/#{APACHE2_MODULE_CONF_NAME}.conf"
+			else
+				filename = PlatformInfo.httpd_default_config_file
+			end
+		when :must_be_in_mods_available
+			if PlatformInfo.httpd_mods_available_directory && PlatformInfo.a2enmod
+				filename = "#{PlatformInfo.httpd_mods_available_directory}/#{APACHE2_MODULE_CONF_NAME}.conf"
+			else
+				raise "Apache does not support the mods-available directory"
+			end
+		when :not_in_mods_available
+			filename = PlatformInfo.httpd_default_config_file
+		else
+			raise ArgumentError
+		end
+
+		if File.exist?(filename)
+			# If this is a file inside mods-available, and the file didn't have a symlink
+			# in mods-enabled, then the uninstall phase did not remove duplicates from this
+			# file. So here we remove duplicates again.
+			puts "Removing duplicate configuration snippets inside #{filename}..."
+			remove_duplicate_comment_blocks(filename,
+				AUTOINSTALL_BEGIN_CONF_BLOCK,
+				AUTOINSTALL_END_CONF_BLOCK)
+
+			puts "Installing #{PROGRAM_NAME} module configuration snippet to #{filename}..."
+			should_add = !update_comment_block(filename,
+				AUTOINSTALL_BEGIN_CONF_BLOCK,
+				AUTOINSTALL_END_CONF_BLOCK,
+				config_snippet)
+		else
+			puts "Installing #{PROGRAM_NAME} module configuration snippet to #{filename}..."
+			should_add = true
+		end
+		if should_add
+			File.open(filename, "ab") do |f|
+				f.write("\n#{AUTOINSTALL_BEGIN_CONF_BLOCK}\n" +
+					"#{config_snippet}\n" +
+					"#{AUTOINSTALL_END_CONF_BLOCK}\n")
+			end
+		end
+	end
+
+	def install_apache2_config_snippets
+		if !@update_config
+			show_apache2_config_snippets
+			return true
+		end
+
+		config_file = PlatformInfo.httpd_default_config_file
+		if config_file && File.exist?(config_file)
+			puts
+			line
+			puts "<banner>Updating Apache configuration files...</banner>"
+			config_file = PlatformInfo.httpd_default_config_file
+			all_config_files = PlatformInfo.httpd_included_config_files(config_file)[:files]
+			backup_config_files(config_file, all_config_files) if @backup_config
+			uninstall_or_comment_out_existing_config_snippets(all_config_files)
+			add_new_config_snippets(all_config_files)
+			return true
+		else
+			show_apache2_config_snippets
+			return true
+		end
+	end
+
+	def show_apache2_config_snippets
+		puts
+		line
+		render_template 'apache2/config_snippets',
+			:snippet => apache2_config_snippets
+		wait
+	end
+
 	def show_deployment_example
 		new_screen
 		render_template 'apache2/deployment_example',
@@ -350,7 +809,7 @@ private
 end
 
 ORIG_ARGV = ARGV.dup
-options = {}
+options = { :compile => true, :update_config => false, :backup_config => true }
 parser = OptionParser.new do |opts|
 	opts.banner = "Usage: passenger-install-apache2-module [options]"
 	opts.separator ""
@@ -373,6 +832,17 @@ parser = OptionParser.new do |opts|
 			"#{indent}'ruby,python,nodejs,meteor')") do |value|
 		options[:languages] = value.split(",")
 	end
+	opts.on("--no-compile", "Skip compilation.") do
+		options[:compile] = false
+	end
+	#opts.on("--no-update-config", "Do not automatically update Apache config\n" <<
+	#		"#{indent}files.") do
+	#	options[:update_config] = false
+	#end
+	#opts.on("--no-backup-config", "When updating Apache config files, do not\n" <<
+	#		"#{indent}create backups of the existing files.") do
+	#	options[:backup_config] = false
+	#end
 	opts.on("--snippet", "Show just the Apache config snippet.") do
 		options[:snippet] = true
 	end
@@ -388,7 +858,7 @@ end
 
 installer = Installer.new(options)
 if options[:snippet]
-	installer.send(:show_apache2_config_snippets, true)
+	puts installer.send(:apache2_config_snippets)
 else
 	installer.run
 end