passenger 4.0.10 → 4.0.13

data/build/preprocessor.rb

@@ -22,7 +22,8 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-# Implements a simple preprocessor language:
+# Implements a simple preprocessor language which combines elements in the C
+# preprocessor with ERB:
 # 
 #     Today
 #     #if @today == :fine
@@ -33,6 +34,7 @@
 #         is a sad day.
 #     #endif
 #     Let's go walking.
+#     Today is <%= Time.now %>.
 # 
 # When run with...
 # 
@@ -43,6 +45,7 @@
 #     Today
 #     is a fine day.
 #     Let's go walking.
+#     Today is 2013-08-11 22:37:06 +0200.
 # 
 # Highlights:
 # 
@@ -50,8 +53,10 @@
 #  * Expressions are Ruby expressions, evaluated within the binding of a
 #    Preprocessor::Evaluator object.
 #  * Text inside #if/#elif/#else are automatically unindented.
+#  * ERB compatible.
 class Preprocessor
 	def initialize
+		require 'erb' if !defined?(ERB)
 		@indentation_size = 4
 		@debug = boolean_option('DEBUG')
 	end
@@ -223,15 +228,13 @@ private
 	end
 
 	def each_line(filename)
-		File.open(filename, 'r') do |f|
-			while true
-				begin
-					line = f.readline.chomp
-				rescue EOFError
-					break
-				end
-				yield line
-			end
+		data = File.open(filename, 'r') do |f|
+			erb = ERB.new(f.read, nil, "-")
+			erb.filename = filename
+			erb.result(binding)
+		end
+		data.each_line do |line|
+			yield line.chomp
 		end
 	end
 	

data/build/test_basics.rb

@@ -54,5 +54,11 @@ task 'test:install_deps' do
 		sh "cd test/stub/rails3.0 && bundle install"
 		sh "cd test/stub/rails3.1 && bundle install"
 		sh "cd test/stub/rails3.2 && bundle install"
+
+		ruby_version_int = RUBY_VERSION.split('.')[0..2].join.to_i
+
+		if ruby_version_int >= 190
+		    sh "cd test/stub/rails4.0 && bundle install"
+                end
 	end
 end

data/debian.template/locations.ini.template

@@ -0,0 +1,13 @@
+[locations]
+natively_packaged=true
+bin_dir=/usr/bin
+agents_dir=/usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/agents
+lib_dir=/usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>
+helper_scripts_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts
+resources_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>
+include_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/include
+doc_dir=/usr/share/doc/ruby-passenger
+ruby_libdir=/usr/lib/ruby/vendor_ruby
+apache2_module_path=/usr/lib/apache2/modules/mod_passenger.so
+ruby_extension_source_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ruby_extension_source
+nginx_module_source_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ngx_http_passenger_module

data/debian.template/ruby-passenger-dev.install.template

@@ -0,0 +1,3 @@
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ngx_http_passenger_module
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/include/
+usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/common/

data/debian.template/ruby-passenger-doc.install.template

@@ -0,0 +1,2 @@
+debian/tmp/usr/share/doc/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/* usr/share/doc/ruby-passenger/
+CONTRIBUTORS usr/share/doc/ruby-passenger/

data/debian.template/ruby-passenger.install.template

@@ -0,0 +1,12 @@
+usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/agents/
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts/
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/templates/
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/standalone_default_root/
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/ruby_extension_source/
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/*.types
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/*.crt
+usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/*.txt
+usr/lib/ruby/
+debian/locations.ini usr/lib/ruby/vendor_ruby/phusion_passenger/
+usr/sbin/
+usr/bin/

data/debian.template/rules.template

@@ -26,6 +26,7 @@ override_dh_auto_install:
 	cp -a pkg/fakeroot1.9.1/* debian/tmp/
 	# Do not package Passenger Standalone.
 	rm -rf debian/tmp/usr/bin/passenger
+	touch debian/tmp/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/release.txt
 
 override_dh_auto_clean:
 	/usr/bin/rake clean CLEAN_DOCS=false

data/dev/run_travis.sh

@@ -21,9 +21,33 @@ function run()
 	"$@"
 }
 
+function apt_get_update() {
+	if [[ "$apt_get_updated" = "" ]]; then
+		apt_get_updated=1
+		run sudo apt-get update
+	fi
+}
+
+function install_test_deps_without_rails_bundles()
+{
+	if [[ "$install_test_deps_without_rails_bundles" = "" ]]; then
+		install_test_deps_without_rails_bundles=1
+		run rake test:install_deps RAILS_BUNDLES=no
+	fi
+}
+
+function install_test_deps_without_rails_bundles_without_doctools()
+{
+	if [[ "$install_test_deps_without_rails_bundles_without_doctools" = "" ]]; then
+		install_test_deps_without_rails_bundles_without_doctools=1
+		rake test:install_deps RAILS_BUNDLES=no DOCTOOLS=no
+	fi
+}
+
 run uname -a
 run lsb_release -a
 sudo tee /etc/dpkg/dpkg.cfg.d/02apt-speedup >/dev/null <<<"force-unsafe-io"
+cp test/config.json.travis test/config.json
 
 if [[ "$TEST_RUBY_VERSION" != "" ]]; then
 	echo "$ rvm use $TEST_RUBY_VERSION"
@@ -56,35 +80,43 @@ fi
 
 if [[ "$TEST_NGINX" = 1 ]]; then
 	run rake test:install_deps RAILS_BUNDLES=no DOCTOOLS=no
-	run gem install rack daemon_controller --no-rdoc --no-ri
 	run ./bin/passenger-install-nginx-module --auto --prefix=/tmp/nginx --auto-download
 	run rake test:integration:nginx
 fi
 
 if [[ "$TEST_APACHE2" = 1 ]]; then
-	run sudo apt-get update
+	apt_get_update
 	run sudo apt-get install -y --no-install-recommends \
 		apache2-mpm-worker apache2-threaded-dev
-	run rake test:install_deps RAILS_BUNDLES=no DOCTOOLS=no
-	run gem install rack --no-rdoc --no-ri
+	install_test_deps_without_rails_bundles_without_doctools
 	run ./bin/passenger-install-apache2-module --auto
 	run rake test:integration:apache2
 fi
 
+if [[ "$TEST_STANDALONE" = 1 ]]; then
+	apt_get_update
+	install_test_deps_without_rails_bundles_without_doctools
+	run rake test:integration:standalone
+fi
+
 if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
-	run sudo apt-get update
+	apt_get_update
 	run sudo apt-get install -y --no-install-recommends \
 		devscripts debhelper rake apache2-mpm-worker apache2-threaded-dev \
-		ruby1.8 ruby1.8-dev ruby1.9.1 ruby1.9.1-dev libev-dev gdebi-core \
+		ruby1.8 ruby1.8-dev ruby1.9.1 ruby1.9.1-dev rubygems libev-dev gdebi-core \
 		source-highlight
-	run rake test:install_deps RAILS_BUNDLES=no
-	run rake debian:dev
-	run sudo gdebi -n pkg/ruby-passenger_*.deb
-	run sudo gdebi -n pkg/ruby-passenger-dev_*.deb
-	run sudo gdebi -n pkg/ruby-passenger-doc_*.deb
-	run sudo gdebi -n pkg/libapache2-mod-passenger_*.deb
-	run rvmsudo env LOCATIONS_INI=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
-		rspec -f s -c test/integration_tests/native_packaging_spec.rb
+	install_test_deps_without_rails_bundles
+	run rake debian:dev debian:dev:reinstall
+	run rake test:integration:native_packaging \
+		LOCATIONS_INI=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
+		SUDO=1
 	run env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
 		rake test:integration:apache2 SUDO=1
 fi
+
+if [[ "$TEST_SOURCE_PACKAGING" = 1 ]]; then
+	apt_get_update
+	run sudo apt-get install -y --no-install-recommends source-highlight
+	install_test_deps_without_rails_bundles
+	run rspec -f s -c test/integration_tests/source_packaging_test.rb
+fi

data/doc/Architectural overview.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="generator" content="AsciiDoc 8.6.7">
-<title>Phusion Passenger design &amp; architecture</title>
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="generator" content="AsciiDoc 8.6.7">
+<title>Phusion Passenger design &amp; architecture</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
@@ -603,7 +603,7 @@ div.exampleblock > div.content, div.sidebarblock > div.content, div.listingblock
 div.verseblock { border-left-width: 0; margin-left: 3em; }
 div.quoteblock { border-left-width: 3px; margin-left: 0; margin-right: 0;}
 div.admonitionblock td.content { border-left: 3px solid #E8E8E8; }
-</style>
+</style>
 <script type="text/javascript">
 /*<![CDATA[*/
 var asciidoc = {  // Namespace.
@@ -797,8 +797,7 @@ install: function(toclevels) {
 }
 asciidoc.install();
 /*]]>*/
-</script>
-<style type="text/css">
+</script><style type="text/css">
 body {
 	margin: 1em auto 1em auto;
 	padding: 0 1em 0 1em;
@@ -1055,11 +1054,10 @@ pre {
 }
 
 </style>
-</head>
+</head>
 <body class="article">
 <div id="topbar" style="display: none">
 	<div class="title">
-		<!-- Don't put a space between the img and a. That will break the hover layout. -->
 		<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAKCAYAAAEV95QVAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sGCRMSACDxkZwAAAAidEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVAgb24gYSBNYWOHqHdDAAAAZUlEQVQY032PSxbAIAjEIlfygL6ePF3UUvpzNjgSYWwqAMEhUQnANnsC7TQPeJpsVWzMuh2sog4vDTUbqP081zECrW4dtdaQGSIKlWluPyjK+VXxAz5XfcKufCzA130AfQHWB30HZxlPaP080xsAAAAASUVORK5CYII=" width="11" height="10" alt=""><a href="javascript:void(Mizuho.smoothlyScrollToToc())">Phusion Passenger design &amp; architecture</a>
 	</div>
 	<a href="javascript:void(0)" id="current_section"></a>
@@ -1070,8 +1068,7 @@ pre {
 <div class="sectionbody">
 <div class="paragraph"><p><span class="image">
 <a class="image" href="http://www.phusion.nl/">
-<img src="images/phusion_banner.png" alt="images/phusion_banner.png">
-</a>
+<img src="images/phusion_banner.png" alt="images/phusion_banner.png"></a>
 </span></p></div>
 <div class="paragraph"><p>Last updated: June 5, 2012.</p></div>
 <div class="paragraph"><p>This document describes Phusion Passenger’s design and architure in a global way.
@@ -1114,11 +1111,10 @@ to exit. This does not necessarily mean that the web application speaks HTTP
 directly: it just means that the web application accepts some kind of
 representation of an HTTP request.</p></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/typical_isolated_web_application.png" alt="Architecture of a typical web application in isolation">
-</span></p></div>
+<img src="images/typical_isolated_web_application.png" alt="Architecture of a typical web application in isolation"></span></p></div>
 <div class="paragraph"><p>Few web applications are accessible directly by HTTP clients. Common models
 are:</p></div>
-<div class="olist arabic"><ol class="arabic">
+<div class="olist arabic"><ol class="arabic">
 <li>
 <p>
 The web application is contained in an application server. This application
@@ -1132,7 +1128,7 @@ sent to the application server, which in turn sends them to the web server,
 and eventually to the HTTP client.
 </p>
 <div class="paragraph"><p>Typical examples of such a model:</p></div>
-<div class="ulist"><ul>
+<div class="ulist"><ul>
 <li>
 <p>
 A J2EE application, contained in the Tomcat application server, proxied
@@ -1243,14 +1239,12 @@ This interface covers HTTP request and response handling, and is not dependent o
 any particular application server. The idea is that any Rack-compliant application
 server can implement the Rack specification and work with all Rack-compliant web applications.</p></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/rack.png" alt="images/rack.png">
-</span></p></div>
+<img src="images/rack.png" alt="images/rack.png"></span></p></div>
 <div class="paragraph"><p>In the distant past, each Ruby web framework had its own interface, so application
 servers needed to explicitly add support for each web framework. Nowadays application
 servers just support Rack.</p></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/many_web_framework_protocols.png" alt="images/many_web_framework_protocols.png">
-</span></p></div>
+<img src="images/many_web_framework_protocols.png" alt="images/many_web_framework_protocols.png"></span></p></div>
 <div class="paragraph"><p>Ruby on Rails has been fully Rack compliant since version 3.0. Rails 2.3 was partially
 Rack-compliant while earlier versions were not Rack-compliant at all. Phusion Passenger
 supports Rack as well as all Rails 1.x and 2.x versions.</p></div>
@@ -1300,10 +1294,9 @@ dynamic module system: all modules must be statically compiled into Nginx.</p></
 Phusion Passenger extends Apache/Nginx and allows it to act like an
 application server. This is shown in the following diagram:</p></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/passenger_architecture.png" alt="Passenger’s architecture">
-</span></p></div>
+<img src="images/passenger_architecture.png" alt="Passenger’s architecture"></span></p></div>
 <div class="paragraph"><p>Phusion Passenger consists of:</p></div>
-<div class="ulist"><ul>
+<div class="ulist"><ul>
 <li>
 <p>
 an Apache module, <em>mod_passenger</em>. This is written in C++, and can be found in the directory <em>ext/apache2</em>.
@@ -1338,7 +1331,7 @@ seconds on a modern computer, and possibly much longer on a heavily loaded serve
 A less naive implementation would keep spawned application processes alive,
 similar to how Lighttpd’s FastCGI implementation works.
 However, this still has several problems:</p></div>
-<div class="olist arabic"><ol class="arabic">
+<div class="olist arabic"><ol class="arabic">
 <li>
 <p>
 The first request to a Rails website will be slow, and subsequent requests
@@ -1405,7 +1398,7 @@ idle for an extended period of time.</p></div>
 <a href="rdoc/index.html">The spawn server’s RDoc documentation</a> documents the
 implementation in detail.</p></div>
 <div class="paragraph"><p>The spawn server consists of 3 logical layers:</p></div>
-<div class="olist arabic"><ol class="arabic">
+<div class="olist arabic"><ol class="arabic">
 <li>
 <p>
 <strong>The spawn manager.</strong> This is the topmost layer, and acts like a fascade for
@@ -1435,8 +1428,7 @@ implementation in detail.</p></div>
 </li>
 </ol></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/spawn_server_architecture.png" alt="The spawn server’s architecture">
-</span></p></div>
+<img src="images/spawn_server_architecture.png" alt="The spawn server’s architecture"></span></p></div>
 <div class="paragraph"><p>As you can see, we have two layers of code caching: when the spawn server
 receives a request to spawn a new application instance, it will forward the
 request to the correct framework spawner server (and will spawn that framework
@@ -1468,9 +1460,9 @@ haven’t been written to. This means that all spawned Rails applications will
 application code, with each other. This results in a dramatic reduction in
 memory usage.</p></div>
 <div class="admonitionblock">
-<table><tr>
+<table><tr>
 <td class="icon">
-<img src="./images/icons/note.png" alt="Note">
+<img src="./images/icons/note.png" alt="Note">
 </td>
 <td class="content">
 <div class="paragraph"><p>Sharing memory only works if <a href="http://www.rubyenterpriseedition.com/">Ruby
@@ -1480,7 +1472,7 @@ Enterprise Edition website for technical details.</p></div>
 <div class="paragraph"><p>Passenger works fine with standard Ruby. You still get to enjoy reduced Rails
 startup times. You just won’t be able to benefit from memory sharing.</p></div>
 </td>
-</tr></table>
+</tr></table>
 </div>
 <div class="paragraph"><p>Note that <a href="http://rubini.us/">Rubinius</a>'s garbage collector is already
 copy-on-write friendly.</p></div>
@@ -1493,7 +1485,7 @@ single request at the same time. This is obviously undesirable. But before we
 dive into the solution, let us take a look how the “competition” solves this
 problem. PHP has similar problems: a single PHP script can also process only
 one HTTP request at a time.</p></div>
-<div class="ulist"><ul>
+<div class="ulist"><ul>
 <li>
 <p>
 mod_php “solves” this problem by using Apache’s MPM. In other words,
@@ -1531,8 +1523,7 @@ algorithm, which is non-trivial. The algorithm is documented in detail in
 Attribution-Share Alike 3.0 Unported License</a>.</p></div>
 <div class="paragraph"><p><span class="image">
 <a class="image" href="link:http://creativecommons.org/licenses/by-sa/3.0/">
-<img src="images/by_sa.png" alt="images/by_sa.png">
-</a>
+<img src="images/by_sa.png" alt="images/by_sa.png"></a>
 </span></p></div>
 </div>
 </div>
@@ -2050,5 +2041,5 @@ Mizuho.initializeTopBar = $.proxy(function() {
 $(document).ready(Mizuho.initializeTopBar);
 
 </script>
-</body>
+</body>
 </html>

data/doc/Packaging.html

@@ -579,16 +579,17 @@ location configuration file, and the configuration depends on the
 
 <pre><code>[locations]
 natively_packaged=true
-bin=/usr/bin
-agents=/usr/lib/phusion-passenger/agents
-libdir=/usr/lib/phusion-passenger
-helper_scripts=/usr/share/phusion-passenger/helper-scripts
-resources=/usr/share/phusion-passenger
-includedir=/usr/share/phusion-passenger/include
-doc=/usr/share/doc/phusion-passenger
-rubylibdir=/usr/lib/ruby/vendor_ruby
-apache2_module=/usr/lib/apache2/modules/mod_passenger.so
-ruby_extension_source=/usr/share/phusion-passenger/ruby_extension_source
+bin_dir=/usr/bin
+agents_dir=/usr/lib/phusion-passenger/agents
+lib_dir=/usr/lib/phusion-passenger
+helper_scripts_dir=/usr/share/phusion-passenger/helper-scripts
+resources_dir=/usr/share/phusion-passenger
+include_dir=/usr/share/phusion-passenger/include
+doc_dir=/usr/share/doc/phusion-passenger
+ruby_libdir=/usr/lib/ruby/vendor_ruby
+apache2_module_path=/usr/lib/apache2/modules/mod_passenger.so
+ruby_extension_source_dir=/usr/share/phusion-passenger/ruby_extension_source
+nginx_module_source_dir=/usr/share/phusion-passenger/ngx_http_passenger_module
 </code></pre>
 
 <p>All keys except fo <code>natively_packaged</code> specify the locations of assets and asset
@@ -656,13 +657,13 @@ a list of all possible assets and asset directories.</p>
 <p>When Phusion Passenger is originally packaged, this refers to the directory
 that contains the entire Phusion passenger source tree. Not available when
 natively packaged.</p></li>
-<li><p><code>bin</code></p>
+<li><p><code>bin_dir</code></p>
 
 <p>A directory containing administration binaries and scripts and like
 <code>passenger-status</code>; tools that the user may directly invoke on the command line.</p>
 
 <p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/bin</code></p></li>
-<li><p><code>agents</code></p>
+<li><p><code>agents_dir</code></p>
 
 <p>A directory that contains (platform-dependent) binaries that Phusion Passenger
 uses, but that should not be directly invoked from the command line. Things like
@@ -671,42 +672,42 @@ PassengerHelperAgent are located here.</p>
 <p>Value when originally packaged:</p>
 
 <ul>
-<li>Normally: <code>&lt;SOURCE_ROOT&gt;/agents</code></li>
+<li>Normally: <code>&lt;SOURCE_ROOT&gt;/buildout/agents</code></li>
 <li>Passenger Standalone: <code>~/.passenger/standalone/&lt;VERSION&gt;/support-&lt;ARCH&gt;</code></li>
 </ul>
 </li>
-<li><p><code>helper_scripts</code></p>
+<li><p><code>helper_scripts_dir</code></p>
 
 <p>A directory that contains non-binary scripts that Phusion Passenger uses, but
 that should not be directly invoked from the command line. Things like
 rack-loader.rb are located here.</p>
 
 <p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/helper-scripts</code></p></li>
-<li><p><code>resources</code></p>
+<li><p><code>resources_dir</code></p>
 
 <p>A directory that contains non-executable, platform-independent resource files
 that the user should not directly access, like error page templates and
 configuration file templates.</p>
 
 <p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/resources</code>.</p></li>
-<li><p><code>doc</code></p>
+<li><p><code>doc_dir</code></p>
 
 <p>A directory that contains documentation.</p>
 
 <p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/doc</code>.</p></li>
-<li><p><code>includedir</code></p>
+<li><p><code>include_dir</code></p>
 
 <p>A directory that contains the Phusion Passenger header files that are
 necessary for compiling Nginx.</p>
 
 <p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/ext</code></p></li>
-<li><p><code>libdir</code></p>
+<li><p><code>lib_dir</code></p>
 
 <p>A directory that contains the Phusion Passenger library files, e.g.
 libboost_oxt.a and various .o files.</p>
 
-<p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/libout</code></p></li>
-<li><p><code>rubylibdir</code></p>
+<p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/buildout</code></p></li>
+<li><p><code>ruby_libdir</code></p>
 
 <p>A directory that contains the Phusion Passenger Ruby library files. Note that
 the Phusion Passenger administration tools still locate phusion_passenger.rb
@@ -715,14 +716,14 @@ irregardless of the value of this key in the location configuration file.
 The value is only useful to non-Ruby Phusion Passenger code.</p>
 
 <p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/lib</code>.</p></li>
-<li><p><code>apache2_module</code></p>
+<li><p><code>apache2_module_path</code></p>
 
 <p>The filename of the Apache 2 module, or the filename that the Apache 2 module
 will be stored after it's compiled. Used by <code>passenger-install-module</code> to
 print an example configuration snippet.</p>
 
-<p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/ext/apache2/mod_passenger.so</code>.</p></li>
-<li><p><code>ruby_extension_source</code></p>
+<p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/buildout/apache2/mod_passenger.so</code>.</p></li>
+<li><p><code>ruby_extension_source_dir</code></p>
 
 <p>The directory that contains the source code for the Phusion Passenger Ruby
 extension. Phusion Passenger uses these sources to build a Ruby extension,
@@ -730,6 +731,13 @@ when it detects that the user is using a new Ruby interpeter for which
 no Ruby extension has been compiled.</p>
 
 <p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/ext/ruby</code>.</p></li>
+<li><p><code>nginx_module_source_dir</code></p>
+
+<p>The directory that contains the source code for the Phusion Passenger Nginx
+module. passenger-install-nginx-module uses these sources to build Nginx
+with Phusion Passenger support.</p>
+
+<p>Value when originally packaged: <code>&lt;SOURCE_ROOT&gt;/ext/nginx</code>.</p></li>
 </ul>