passenger 4.0.10 → 4.0.13

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJR5WamAAoJECrHRaUKISqMsmoH/igRg7U+YBfKIrRjpDo1Dq3S
-/aaIPmBo9QudDtB2I50CbldyvDQGYmHEogQXXENZVEHe4erFvhhpHVAO4l4SEpBN
-0vd2M8DXTx8QZX+AF4JwHnWG+xqLzRYgoa6vTaukZpuHjVSHD70eDs3GSNcIYQZw
-83OS6pwq11UZ7TAJk/poovo7B224+K1Nqxl/RUCqlBPLuWGchtuPUSn3W/HTWN39
-SMry/gVXWWkQ2O0rIBFGy6HyhV+SVJ1gkOIoei/P+4CNDl/9g7xdRlQSCycwQuaL
-fm7Jf6VFnrp3WHIK2zd4++5/RyRYCt4ngOmzXzbR8/czsaf64A9cEKTSlw7OV1Y=
-=r1UX
+iQEcBAABAgAGBQJSDPHCAAoJECrHRaUKISqMLiEH/A4OA7fXNqA3/aIzUn5coY6J
+MMmrKyTHGxL743dWP2ja28TCIoq41TfDUsWodPbVVUSXQOfOOP83Inz9xa4JB9mw
+cCU47RgmsFKsDtiwsXA0JLAtynzMMC1bk4doVWI7dh8pfckKDfwk4MvS5aMoCfyr
+98Irb7YO7hrsGAdk6NU60HghxnF661TnSTdN4IJLImQDGeuXIxRBSvE5HY13cUOO
+9zi+UiGHTSq/1ZKs06NV+OjYXijD4H5U+a8yX/Oxz1mZTKg6/4bHWp16CshphDjp
+9KqEfXgU9M+izSamX9xy3AIcJgpw8pg/PPvIljXdryUf2IAkPwcgF5ZwJhtAXfE=
+=1Fig
 -----END PGP SIGNATURE-----

data/.gitignore

@@ -0,0 +1,66 @@
+.cache
+.DS_Store
+.rbx
+autom4te.cache
+*.o
+*.so
+*.bundle
+*.pyc
+*.a
+*.lo
+*.la
+*.slo
+*.dSYM
+*.gch
+*.swp
+*~.nib
+*.pbxuser
+*.perspective
+*.perspectivev3
+*.mode1v3
+*.mode2v3
+xcuserdata
+/config.rb
+/buildout
+build/cache
+ext/common/libboost_oxt
+ext/common/libpassenger_common
+ext/apache2/module_libboost_oxt
+ext/apache2/module_libpassenger_common
+ext/libev/Makefile
+ext/libev/config.h
+ext/libev/config.log
+ext/libev/config.status
+ext/libev/libtool
+ext/libev/stamp-h1
+ext/libev/ev.3
+ext/libev/ev.pod
+ext/libev/.libs
+ext/libeio/Makefile
+ext/libeio/config.h
+ext/libeio/config.log
+ext/libeio/config.status
+ext/libeio/eio.3
+ext/libeio/eio.pod
+ext/ruby/*/Makefile
+ext/ruby/*/mkmf.log
+ext/*.a
+doc/rdoc
+doc/cxxapi
+doc/*.html
+helper-scripts/download_binaries/Makefile
+test/.gdbinit
+test/test.log
+test/apache2.log
+test/config.yml
+test/config.json
+test/coverage
+test/cxx/CxxTestMain
+test/oxt/oxt_test_main
+test/stub/apache2/*.log
+test/stub/apache2/*.pid
+test/stub/apache2/httpd.conf
+test/stub/zsfa/mycook
+test/stub/zsfa/foo
+test/support/allocate_memory
+pkg

data/.travis.yml

@@ -5,11 +5,8 @@ env:
   - TEST_CXX=1 SUDO=1
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_CLASSIC_RAILS=0
   - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0
-  - TEST_NGINX=1 TEST_RUBYGEMS_VERSION=1.8.25
+  - TEST_NGINX=1 TEST_STANDALONE=1 TEST_RUBYGEMS_VERSION=1.8.25
   - TEST_APACHE2=1 TEST_RUBYGEMS_VERSION=1.8.25
-  - TEST_DEBIAN_PACKAGING=1 TEST_RUBYGEMS_VERSION=1.8.25
-
-before_install:
-  - cp test/config.json.travis test/config.json
+  - TEST_SOURCE_PACKAGING=1 TEST_DEBIAN_PACKAGING=1 TEST_RUBYGEMS_VERSION=1.8.25
 
 script: ./dev/run_travis.sh

data/CONTRIBUTORS

@@ -14,6 +14,7 @@ Damien Le Berrigaud
 Dan Peterson
 Danial Pearce
 Dave Parfitt
+David Keller
 David Sissitka
 Dirk Mueller
 Dmitry Galinsky
@@ -21,7 +22,7 @@ Dylan Vaughn
 Erik Ogan
 Evan Phoenix
 Gaspard Bucher
-Goffert van Gool
+Goffert van Gool (Phusion)
 Gokulnath Manakkattil
 Gregory Potamianos
 Hongli Lai (Phusion)

data/NEWS

@@ -1,3 +1,27 @@
+Release 4.0.13
+--------------
+
+ * Updated preferred Nginx version to 1.4.2.
+ * Worked around the fact that FreeBSD 9.1 has a broken C++ runtime. Patch
+   contributed by David Keller.
+ * Autogenerated HTTP Date headers are now in UTC instead of local time.
+   This could cause cookies to have the wrong expiration time. Fixes issue #913.
+ * Fixed compatibility problems with Ruby 1.8.6 (issue #924).
+ * Introduced a tool, `passenger-config --detect-apache2`, which autodetects
+   all Apache installations on the system along with their parameters (which
+   apachectl command to run, which log file to read, which config file to edit).
+   The tool advises users about how to use that specific Apache installation.
+   Useful if the user has multiple Apache installations but don't know about
+   it, or when the user doesn't know how to work with multiple Apache
+   installations.
+ * Added an API for better Rack socket hijacking support.
+ * Added a hidden configuration option for customizing the application start
+   timeout. A proper configuration option will be introduced in the future.
+ * Added autodetection support for Amazon Linux.
+ * Fixed process metrics collection on some operating systems. Some systems'
+   'ps' command expect no space between -p and the list of PIDs.
+
+
 Release 4.0.10
 --------------
 

data/README.md

@@ -2,12 +2,9 @@
 
 [Phusion Passenger](https://www.phusionpassenger.com/) is a web server and application server, designed to be fast, robust and lightweight. It runs your web apps with the least amount of hassle by taking care of almost all administrative heavy lifting for you. Advanced administration tools allow you to gain deep insight into your web applications' operations and to keep your servers healthy. Phusion Passenger is polyglot by design, and currently supports Ruby (Rack), Python (WSGI) and Node.js.
 
-This is the [Phusion Passenger web application server](https://www.phusionpassenger.com/).
-
 ## Regular installation
 
-You can install either Phusion Passenger for Apache or for Nginx. Run either of
-the following programs as root:
+You can install either Phusion Passenger for Apache or for Nginx. Basically, installation involves running one of these commands:
 
     ./bin/passenger-install-apache2-module
 
@@ -15,14 +12,12 @@ the following programs as root:
 
     ./bin/passenger-install-nginx-module
 
-That's it. :)
-
-For troubleshooting, configuration and tips, please read the corresponding Users Guide:
+That's it. :) However on some systems installation may require some more steps. You may have to run `sudo` or `rvmsudo`, and you may have to relax permissions on some directories, etc. Detailed fool-proof installation instructions can be found in the documentation:
 
- * doc/Users guide Apache.html
- * doc/Users guide Nginx.html
+ * [Apache version](http://www.modrails.com/documentation/Users%20guide%20Apache.html#tarball_generic_install)
+ * [Nginx version](http://www.modrails.com/documentation/Users%20guide%20Nginx.html#tarball_generic_install)
 
-These files are included in the source tarball, and may also be viewed online on [our website](https://www.phusionpassenger.com/support).
+For troubleshooting, configuration and tips, please also refer to the above documentation. For further support, please refer to [the Phusion Passenger support page](https://www.phusionpassenger.com/support).
 
 ## Installing as a gem
 

data/bin/passenger

@@ -30,4 +30,5 @@ PhusionPassenger.locate_directories
 require 'rubygems' rescue nil
 require 'phusion_passenger/standalone/main'
 
+STDOUT.sync = STDERR.sync = true
 PhusionPassenger::Standalone::Main.run!(ARGV)

data/bin/passenger-config

@@ -41,6 +41,9 @@ def help
 	puts "  --nginx-libs               Show Nginx runtime library flags."
 	puts "  --compiled                 Check whether runtime libraries are compiled."
 	puts "  --natively-packaged        Check whether Phusion Passenger is natively packged."
+	puts "  --installed-from-release-package  Check whether this installation came from an official release package."
+	puts "  --make-locations-ini       Generate a locations.ini based on the current install paths."
+	puts "  --detect-apache2           Autodetect Apache installations."
 	puts "  --ruby-command             Print the correct command for invoking the Ruby interpreter."
 	puts "  --rubyext-compat-id        Print the Ruby extension binary compatibility ID."
 	puts "  --cxx-compat-id            Print the C++ binary compatibility ID."
@@ -60,7 +63,7 @@ when "--root"
 when "--includedir"
 	puts PhusionPassenger.include_dir
 when "--nginx-addon-dir"
-	puts PhusionPassenger.nginx_addon_dir
+	puts PhusionPassenger.nginx_module_source_dir
 when "--nginx-libs"
 	text = "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
 	if PhusionPassenger::PlatformInfo.has_math_library?
@@ -84,6 +87,27 @@ when "--natively-packaged"
 	else
 		exit 1
 	end
+when "--installed-from-release-package"
+	if PhusionPassenger.installed_from_release_package?
+		exit 0
+	else
+		exit 1
+	end
+when "--make-locations-ini"
+	puts "[locations]"
+	puts "natively_packaged=true"
+	PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
+		puts "#{field}=#{PhusionPassenger.send(field)}"
+	end
+when "--detect-apache2"
+	require 'phusion_passenger/platform_info/apache_detector'
+	detector = PhusionPassenger::PlatformInfo::ApacheDetector.new(STDOUT)
+	begin
+		detector.detect_all
+		detector.report
+	ensure
+		detector.finish
+	end
 when "--ruby-command"
 	require 'phusion_passenger/platform_info/ruby'
 	ruby = PhusionPassenger::PlatformInfo.ruby_command
@@ -98,7 +122,9 @@ when "--ruby-command"
 	puts
 
 	ruby = PhusionPassenger::PlatformInfo.find_command('ruby')
-	if ruby
+	if ruby && !ruby.include?("rvm/rubies/")
+		# If this is an RVM Ruby executable then we don't show it. We want people to
+		# use the RVM wrapper scripts only.
 		puts "The following Ruby interpreter was found first in $PATH:"
 		puts "  Command: #{ruby}"
 		STDOUT.write "  Version: "
@@ -107,7 +133,7 @@ when "--ruby-command"
 		puts "  To use in Apache: PassengerRuby #{ruby}"
 		puts "  To use in Nginx : passenger_ruby #{ruby}"
 		puts "  To use with Standalone: #{ruby} #{PhusionPassenger.bin_dir}/passenger start"
-	else
+	elsif !ruby.include?("rvm/rubies/")
 		puts "No Ruby interpreter found in $PATH."
 	end
 	puts

data/bin/passenger-install-nginx-module

@@ -431,7 +431,7 @@ private
 		elsif !pcre_is_installed?
 			command << "--without-http_rewrite_module "
 		end
-		command << "--add-module='#{PhusionPassenger.nginx_addon_dir}' #{extra_configure_flags}"
+		command << "--add-module='#{PhusionPassenger.nginx_module_source_dir}' #{extra_configure_flags}"
 		command.strip!
 		return command
 	end

data/build/basics.rb

@@ -59,8 +59,14 @@ class TemplateRenderer
 	def render_to(filename)
 		puts "Creating #{filename}"
 		text = render
-		File.open(filename, 'w') do |f|
-			f.write(text)
+		# When packaging, some timestamps may be modified. The user may not
+		# have write access to the source root (for example, when Passenger
+		# Standalone is compiling its runtime), so we only write to the file
+		# when necessary.
+		if File.writable?(filename) || File.read(filename) != text
+			File.open(filename, 'w') do |f|
+				f.write(text)
+			end
 		end
 	end
 end

data/build/debian.rb

@@ -91,6 +91,28 @@ task 'debian:dev' do
 	end
 end
 
+desc "(Re)install the Debian binary packages built for local testing"
+task 'debian:dev:reinstall' do
+	package_names = ["ruby-passenger", "ruby-passenger-dev",
+		"ruby-passenger-doc", "libapache2-mod-passenger"]
+	package_names.each do |name|
+		if Dir["#{PKG_DIR}/#{name}_*.deb"].size > 1
+			abort "Please ensure that #{PKG_DIR} only has 1 version of the Phusion Passenger packages."
+		end
+	end
+	package_names.each do |name|
+		if !system "sudo apt-get remove -y #{name}"
+			if !$? || $?.exitstatus != 100
+				abort
+			end
+		end
+	end
+	package_names.each do |name|
+		filename = Dir["#{PKG_DIR}/#{name}_*.deb"].first
+		sh "sudo gdebi -n #{filename}"
+	end
+end
+
 desc "Build Debian source packages to be uploaded to repositories"
 task 'debian:production' => 'debian:orig_tarball' do
 	if boolean_option('USE_CCACHE', false)

data/build/integration_tests.rb

@@ -53,14 +53,28 @@ task 'test:integration:nginx' => dependencies do
 	end
 end
 
+dependencies = [:nginx, NATIVE_SUPPORT_TARGET].compact
+desc "Run Passenger Standalone integration tests"
+task 'test:integration:standalone' => dependencies do
+	if PlatformInfo.rspec.nil?
+		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
+	else
+		Dir.chdir("test") do
+			ruby "#{PlatformInfo.rspec} -c -f s integration_tests/standalone_tests.rb"
+		end
+	end
+end
+
 desc "Run native packaging tests"
 task 'test:integration:native_packaging' do
 	if PlatformInfo.rspec.nil?
 		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
 	else
-		Dir.chdir("test") do
-			ruby "#{PlatformInfo.rspec} -c -f s integration_tests/native_packaging_spec.rb"
+		command = "#{PlatformInfo.rspec} -c -f s integration_tests/native_packaging_spec.rb"
+		if boolean_option('SUDO')
+			command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
 		end
+		sh "cd test && #{command}"
 	end
 end
 

data/build/misc.rb

@@ -164,8 +164,11 @@ task :contributors do
 	entries.delete "Hongli Lai (Phusion"
 	entries.delete "Ninh Bui"
 	entries.push "Ninh Bui (Phusion)"
+	entries.delete "Phusion Dev"
 	entries.delete "Tinco Andringa"
 	entries.push "Tinco Andringa (Phusion)"
+	entries.delete "Goffert van Gool"
+	entries.push "Goffert van Gool (Phusion)"
 	entries.delete "Gokulnath"
 	entries.push "Gokulnath Manakkattil"
 	File.open("CONTRIBUTORS", "w") do |f|

data/build/packaging.rb

@@ -25,6 +25,9 @@ ORIG_TARBALL_FILES = lambda { PhusionPassenger::Packaging.files }
 
 def recursive_copy_files(files, destination_dir, preprocess = false, variables = {})
 	require 'fileutils' if !defined?(FileUtils)
+	if !STDOUT.tty?
+		puts "Copying files..."
+	end
 	files.each_with_index do |filename, i|
 		dir = File.dirname(filename)
 		if !File.exist?("#{destination_dir}/#{dir}")
@@ -40,17 +43,25 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
 				FileUtils.install(filename, "#{destination_dir}/#{filename}", :preserve => true)
 			end
 		end
-		printf "\r[%5d/%5d] [%3.0f%%] Copying files...", i + 1, files.size, i * 100.0 / files.size
-		STDOUT.flush
+		if STDOUT.tty?
+			printf "\r[%5d/%5d] [%3.0f%%] Copying files...", i + 1, files.size, i * 100.0 / files.size
+			STDOUT.flush
+		end
+	end
+	if STDOUT.tty?
+		printf "\r[%5d/%5d] [%3.0f%%] Copying files...\n", files.size, files.size, 100
 	end
-	printf "\r[%5d/%5d] [%3.0f%%] Copying files...\n", files.size, files.size, 100
 end
 
 
 task :clobber => 'package:clean'
 
+task 'package:set_official' do
+	ENV['OFFICIAL_RELEASE'] = '1'
+end
+
 desc "Build, sign & upload gem & tarball"
-task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
+task 'package:release' => ['package:set_official', 'package:gem', 'package:tarball', 'package:sign'] do
 	require 'phusion_passenger'
 	require 'yaml'
 	require 'uri'
@@ -77,7 +88,8 @@ task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
 			"admin_password: ..."
 	end
 
-	sh "git tag -s #{tag_prefix}-#{version} -u 0A212A8C -m 'Release #{version}'"
+	tag = "#{tag_prefix}-#{version}"
+	sh "git tag -s #{tag} -u 0A212A8C -m 'Release #{version}'"
 
 	puts "Proceed with pushing tag to remote Git repo and uploading the gem and signatures? [y/n]"
 	if STDIN.readline == "y\n"
@@ -104,6 +116,9 @@ task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
 					"Status: #{response.code}\n\n" +
 					response.body
 			end
+			sh "cd ../passenger_autobuilder && " +
+				"git pull && " +
+				"./autobuild-osx https://github.com/phusion/passenger.git passenger psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{tag}"
 			puts "--------------"
 			puts "All done."
 		else
@@ -111,6 +126,9 @@ task 'package:release' => ['package:gem', 'package:tarball', 'package:sign'] do
 			subdir = string_option('NAME', version)
 			sh "scp pkg/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} app@shell.phusion.nl:#{dir}/"
 			sh "ssh app@shell.phusion.nl 'mkdir -p \"#{dir}/assets/#{subdir}\" && mv #{dir}/#{basename}.{gem,tar.gz,gem.asc,tar.gz.asc} \"#{dir}/assets/#{subdir}/\"'"
+			sh "cd ../passenger_autobuilder && " +
+				"git pull && " +
+				"./autobuild-osx TODO passenger-enterprise psg_autobuilder_chroot@juvia-helper.phusion.nl --tag=#{tag}"
 		end
 	else
 		puts "Did not upload anything."
@@ -119,9 +137,26 @@ end
 
 task 'package:gem' => Packaging::PREGENERATED_FILES do
 	require 'phusion_passenger'
-	sh "gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec --sign --key 0x0A212A8C"
-	sh "mkdir -p pkg"
-	sh "mv #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.gem pkg/"
+	if ENV['OFFICIAL_RELEASE']
+		release_file = "#{PhusionPassenger.resources_dir}/release.txt"
+		File.unlink(release_file) rescue nil
+	end
+	begin
+		if release_file
+			File.open(release_file, "w").close
+		end
+		command = "gem build #{PhusionPassenger::PACKAGE_NAME}.gemspec"
+		if !boolean_option('SKIP_SIGNING')
+			command << " --sign --key 0x0A212A8C"
+		end
+		sh(command)
+	ensure
+		if release_file
+			File.unlink(release_file) rescue nil
+		end
+	end
+	sh "mkdir -p #{PKG_DIR}"
+	sh "mv #{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}.gem #{PKG_DIR}/"
 end
 
 task 'package:tarball' => Packaging::PREGENERATED_FILES do
@@ -129,11 +164,14 @@ task 'package:tarball' => Packaging::PREGENERATED_FILES do
 	require 'fileutils'
 
 	basename = "#{PhusionPassenger::PACKAGE_NAME}-#{PhusionPassenger::VERSION_STRING}"
-	sh "rm -rf pkg/#{basename}"
-	sh "mkdir -p pkg/#{basename}"
-	recursive_copy_files(ORIG_TARBALL_FILES.call, "pkg/#{basename}")
-	sh "cd pkg && tar -c #{basename} | gzip --best > #{basename}.tar.gz"
-	sh "rm -rf pkg/#{basename}"
+	sh "rm -rf #{PKG_DIR}/#{basename}"
+	sh "mkdir -p #{PKG_DIR}/#{basename}"
+	recursive_copy_files(ORIG_TARBALL_FILES.call, "#{PKG_DIR}/#{basename}")
+	if ENV['OFFICIAL_RELEASE']
+		File.open("#{PKG_DIR}/#{basename}/resources/release.txt", "w").close
+	end
+	sh "cd #{PKG_DIR} && tar -c #{basename} | gzip --best > #{basename}.tar.gz"
+	sh "rm -rf #{PKG_DIR}/#{basename}"
 end
 
 task 'package:sign' do
@@ -190,18 +228,19 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
 	fake_rubylibdir = "#{fakeroot}/usr/lib/ruby/vendor_ruby"
-	fake_libdir = "#{fakeroot}/usr/lib/passenger"
+	fake_libdir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
 	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
 	fake_agents_dir = "#{fakeroot}/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
 	fake_helper_scripts_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
-	fake_resources_dir = "#{fakeroot}/usr/share/passenger"
-	fake_include_dir = "#{fakeroot}/usr/share/passenger/include"
+	fake_resources_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
+	fake_include_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/include"
 	fake_docdir = "#{fakeroot}/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}"
 	fake_bindir = "#{fakeroot}/usr/bin"
 	fake_sbindir = "#{fakeroot}/usr/sbin"
 	fake_apache2_module_dir = "#{fakeroot}/usr/lib/apache2/modules"
 	fake_apache2_module = "#{fake_apache2_module_dir}/mod_passenger.so"
-	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/passenger/ruby_extension_source"
+	fake_ruby_extension_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+	fake_nginx_module_source_dir = "#{fakeroot}/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
 	
 	sh "rm -rf #{fakeroot}"
 	sh "mkdir -p #{fakeroot}"
@@ -256,8 +295,8 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	end
 
 	# Nginx module sources
-	sh "mkdir -p #{fake_resources_dir}/ngx_http_passenger_module"
-	sh "cp ext/nginx/* #{fake_resources_dir}/ngx_http_passenger_module/"
+	sh "mkdir -p #{fake_nginx_module_source_dir}"
+	sh "cp ext/nginx/* #{fake_nginx_module_source_dir}/"
 	
 	# Documentation
 	sh "mkdir -p #{fake_docdir}"
@@ -288,16 +327,25 @@ task :fakeroot => [:apache2, :nginx, :doc] do
 	File.open("#{fake_rubylibdir}/phusion_passenger/locations.ini", "w") do |f|
 		f.puts "[locations]"
 		f.puts "natively_packaged=true"
-		f.puts "bin=/usr/bin"
-		f.puts "agents=/usr/lib/passenger/agents"
-		f.puts "libdir=/usr/lib/passenger"
-		f.puts "helper_scripts=/usr/share/passenger/helper-scripts"
-		f.puts "resources=/usr/share/passenger"
-		f.puts "includedir=/usr/share/passenger/include"
-		f.puts "doc=/usr/share/doc/passenger"
-		f.puts "rubylibdir=/usr/lib/ruby/vendor_ruby"
-		f.puts "apache2_module=/usr/lib/apache2/modules/mod_passenger.so"
-		f.puts "ruby_extension_source=/usr/share/passenger/ruby_extension_source"
+		f.puts "bin_dir=/usr/bin"
+		f.puts "agents_dir=/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+		f.puts "lib_dir=/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}"
+		f.puts "helper_scripts_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+		f.puts "resources_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}"
+		f.puts "include_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/include"
+		f.puts "doc_dir=/usr/share/doc/#{GLOBAL_NAMESPACE_DIRNAME}"
+		f.puts "ruby_libdir=/usr/lib/ruby/vendor_ruby"
+		f.puts "apache2_module_path=/usr/lib/apache2/modules/mod_passenger.so"
+		f.puts "ruby_extension_source_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+		f.puts "nginx_module_source_dir=/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+	end
+
+	# Sanity check the locations.ini file
+	options = PhusionPassenger.parse_ini_file("#{fake_rubylibdir}/phusion_passenger/locations.ini")
+	PhusionPassenger::REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
+		if !options[field.to_s]
+			raise "Bug in build/packaging.rb: the generated locations.ini is missing the '#{field}' field"
+		end
 	end
 
 	sh "find #{fakeroot} -name .DS_Store -print0 | xargs -0 rm -f"