passenger 4.0.23 → 4.0.24

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSc3k/AAoJECrHRaUKISqM9I4IAI8VFAa5vgqAzoQjbV36YBCS
-inElj7A0NH/bEOqcFNmu2B3kn4GVUn72/zldo/gbhCJWEVpwNYIwBGUjsc8gQjwY
-6bXWtf8gjuHbu/z9ZSTacJBf9faLD0tRiYre9qBd4cWdh/tC85vC57nnHMcVwsE4
-HGd1BBmVDD0dB3J+bOBclLFuQ1OCqXFa3uNtxZThqtNfwcohp4eslmBsGPvFRhsK
-Di8lKSr/ATa/vXvbCsm2+v4ybREBWRZQyYChdo4FhPp6NxJT2f/CaOWEKwWphr9g
-onhfcsC316G3ywJb4D+2yF6n3ZZIcQWPwLMqRsq6K704o/NRKC4xEAnYGI95nMI=
-=//tM
+iQEcBAABAgAGBQJShLLBAAoJECrHRaUKISqM1uUH/RdBRvtxskGHHdZszBUNQvXT
+SfE8B2oFFPLQwLEv/xLrkT+38lZZmRSFUsTdC5oeddByz8mKEKmD8pTQ2KbqpeEO
+isWz9EClNxKdKrLEUiSBP/sHFM6V4uaMbzZ5h85gwrINEidNG+ovBoxLOErraiDV
+0iX26Sc3QpSD9sWrY+ZtrZIs8wWjzRq0cpRh4QtMe19K2fzUe3TBlcsJDY4bcI3L
+4lE/Ufwm+5yh8I5IgvTNkxxmA05FDJN7Jh8h/jwHbKxWX4/CqNADqaKvfO9VqXYd
+jffewfennXjyGYJ5K3GvBZ5G5UUOXK+UDTSoRtYrDt3ctP6ylXGOLe5m05JznR0=
+=o6KQ
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,20 @@
+Release 4.0.24
+--------------
+
+ * Introduced the `PassengerNodejs` (Apache) and `passenger_nodejs` (Nginx)
+   configuration options.
+ * [Apache] Introduced the `PassengerErrorOverride` option, so that HTTP error
+   responses generated by applications can be intercepted by Apache and customized
+   using the `ErrorDocument` directive.
+ * [Standalone] It is now possible to specify some configuration options in
+   a configuration file `passenger-standalone.json`. When Passenger Standalone
+   is used in Mass Deployment mode, this configuration file can be used to customize
+   settings on a per-application basis.
+ * [Enterprise] Fixed a potential crash when a rolling restart is triggered
+   while a process is already shutting down.
+ * [Enterprise] Fixed Mass Deployment support for Node.js and Meteor.
+
+
 Release 4.0.23
 --------------
 

data/bin/passenger-config

@@ -47,6 +47,7 @@ def help
 	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 "  --ruby-libdir              Show Phusion Passenger's Ruby library directory."
 	puts "  --rubyext-compat-id        Print the Ruby extension binary compatibility ID."
 	puts "  --cxx-compat-id            Print the C++ binary compatibility ID."
 	puts "  --version                  Show version number."
@@ -137,6 +138,8 @@ when "--ruby-command"
 	puts
 	puts "## Notes for RVM users"
 	puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'."
+when "--ruby-libdir"
+	puts PhusionPassenger.ruby_libdir
 when "--rubyext-compat-id"
 	require 'phusion_passenger/platform_info/binary_compatibility'
 	puts PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibility_id

data/bin/passenger-install-apache2-module

@@ -208,7 +208,7 @@ private
 			render_template 'installer_common/run_installer_as_root',
 				:dir  => PhusionPassenger.source_root,
 				:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
-				:sudo_e => "#{PhusionPassenger::PlatformInfo.ruby_sudo_command} -E",
+				: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

data/bin/passenger-install-nginx-module

@@ -367,7 +367,7 @@ private
 			render_template 'installer_common/run_installer_as_root',
 				:dir  => dir,
 				:sudo => PhusionPassenger::PlatformInfo.ruby_sudo_command,
-				:sudo_e => "#{PhusionPassenger::PlatformInfo.ruby_sudo_command} -E",
+				:sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
 				:ruby => PhusionPassenger::PlatformInfo.ruby_command,
 				:installer => "#{PhusionPassenger.bin_dir}/passenger-install-nginx-module #{ORIG_ARGV.join(' ')}"
 		end

data/build/integration_tests.rb

@@ -47,9 +47,11 @@ task 'test:integration:nginx' => 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/nginx_tests.rb"
+		command = "#{PlatformInfo.rspec} -c -f s integration_tests/nginx_tests.rb"
+		if boolean_option('SUDO')
+			command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
 		end
+		sh "cd test && #{command}"
 	end
 end
 
@@ -60,7 +62,7 @@ task 'test:integration:standalone' => dependencies do
 		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"
+			#ruby "#{PlatformInfo.rspec} -c -f s integration_tests/standalone_tests.rb"
 		end
 	end
 end

data/debian.template/control.template

@@ -6,10 +6,10 @@ Uploaders: Phusion <info@phusion.nl>, Hongli Lai <hongli@phusion.nl>
 Build-Depends: debhelper (>= 7.0.50~), rake,
  ruby1.8, ruby1.8-dev, rubygems1.8,
  ruby1.9.1, ruby1.9.1-dev,
- apache2-mpm-worker | apache2-mpm, apache2-threaded-dev,
 #if is_distribution?('<= lucid')
      rubygems1.9,
 #endif
+ apache2-mpm-worker | apache2-mpm, apache2-threaded-dev,
 #if is_distribution?('>= precise') || is_distribution?('>= wheezy')
      libev-dev (>= 1:4.0.0),
 #endif
@@ -22,8 +22,9 @@ XS-Ruby-Versions: all
 
 Package: passenger
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
- rubygems (>= 1.2),
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
+ rubygems2.0 | rubygems1.9.1 | rubygems1.9 | rubygems (>= 1.2),
 #if is_distribution?('<= lucid') || is_distribution?('<= squeeze')
      librack-ruby,
 #else
@@ -45,7 +46,8 @@ Description: Rails and Rack support for Apache2 and Nginx
 
 Package: passenger-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
  passenger (= ${binary:Version})
 Suggests: python
 Replaces: ruby-passenger-dev

data/doc/Users guide Apache.idmap.txt

@@ -130,13 +130,15 @@
 
 6.3.3. PassengerPython <filename>	=>	passengerpython-filename--1ssesv3
 
-6.3.4. PassengerAppRoot <path/to/root>	=>	passengerapproot-path-to-root--uf24yd
+6.3.4. PassengerNodejs <filename>	=>	passengernodejs-filename--2mjb1j
 
-6.3.5. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
+6.3.5. PassengerAppRoot <path/to/root>	=>	passengerapproot-path-to-root--uf24yd
 
-6.3.6. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+6.3.6. PassengerRestartDir <directory>	=>	passengerrestartdir-directory--1fmhmv0
 
-6.3.7. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
+6.3.7. PassengerRollingRestarts <on|off>	=>	passengerrollingrestarts
+
+6.3.8. PassengerResistDeploymentErrors <on|off>	=>	passengerresistdeploymenterrors
 
 6.4. Process spawning options	=>	process-spawning-options-v2vscm
 
@@ -194,7 +196,9 @@
 
 6.7.1. PassengerBufferResponse <on|off>	=>	passengerbufferresponse-on-off--1y7ilka
 
-6.7.2. PassengerMaxRequestQueueSize <number>	=>	passenger-max-request-queue-size-number--1f1uocd
+6.7.2. PassengerErrorOverride <on|off>	=>	passengererroroverride-on-off--1pq9nez
+
+6.7.3. PassengerMaxRequestQueueSize <number>	=>	passenger-max-request-queue-size-number--1f1uocd
 
 6.8. Compatibility options	=>	compatibility-options-8jve5a
 

data/doc/Users guide Apache.txt

@@ -534,7 +534,7 @@ In each place, it may be specified at most once. The default value is 'on'.
 
 [[PassengerRuby]]
 ==== PassengerRuby <filename>
-The `PassengerDefaultRuby` and `PassengerRuby` directives specify the Ruby interpreter to use. Similarly, the `PassengerPython` directive is for specifying the Python interpreter.
+The `PassengerDefaultRuby` and `PassengerRuby` directives specify the Ruby interpreter to use. Similarly, the `PassengerPython` and `PassengerNodejs` directives are for specifying the Python interpreter and the Node.js command, respectively.
 
 The relationship between `PassengerDefaultRuby` and `PassengerRuby` is as follows:
 
@@ -548,15 +548,17 @@ It is okay if `PassengerDefaultRuby` refers to a different Ruby interpreter than
 
 The reason why `PassengerDefaultRuby` exists at all is because limitations in the Apache API prevents us from implementing the same behavior using only the `PassengerRuby` directive.
 
-There is no `PassengerDefaultPython` because there are no Phusion Passenger tools written in Python. As such, having `PassengerPython` is enough.
+There is no `PassengerDefaultPython` etc because there are no Phusion Passenger tools written in Python. As such, having `PassengerPython` is enough.
 
-The following example illustrates how it works and how you can use these options to specify different Ruby/Python interpreters for different web apps.
+The following example illustrates how it works and how you can use these options to specify different interpreters for different web apps.
 
 ------------------------------
 # Use Ruby 1.8.7 by default.
 PassengerDefaultRuby /usr/bin/ruby1.8
 # Use Python 2.6 by default.
 PassengerPython /usr/bin/python2.6
+# Use /usr/bin/node by default.
+PassengerNodejs /usr/bin/node;
 
 <VirtualHost *:80>
     # This Rails web app will use Ruby 1.8.7
@@ -595,6 +597,12 @@ include::users_guide_snippets/since_version.txt[]
 
 This option allows one to specify the Python interpreter to use. See <<PassengerRuby,PassengerRuby>> for more information. The default value is 'python', meaning that the Python interpreter will be looked up according to the `PATH` environment variable.
 
+==== PassengerNodejs <filename>
+:version: 4.0.24
+include::users_guide_snippets/since_version.txt[]
+
+This option allows one to specify the Node.js command to use. See <<PassengerRuby,PassengerRuby>> for more information. The default value is 'node', meaning that the Node.js command will be looked up according to the `PATH` environment variable.
+
 [[PassengerAppRoot]]
 ==== PassengerAppRoot <path/to/root>
 By default, Phusion Passenger assumes that the application's root directory
@@ -1628,6 +1636,26 @@ The <<PassengerBufferResponse,PassengerBufferResponse>> directive should be turn
 if responses can be huge. Because entire responses are buffered in memory when turned on.
 =====================================================
 
+[[PassengerErrorOverride]]
+==== PassengerErrorOverride <on|off> ====
+:version: 4.0.24
+include::users_guide_snippets/since_version.txt[]
+
+Decides whether Apache will intercept and handle responses with HTTP status codes of 400 and higher. This directive is useful where you want to have a common look and feel on the error pages seen by the end user. This also allows for included files (via mod_include's SSI) to get the error code and act accordingly (default behavior would display the error page of the proxied server, turning this on shows the SSI Error message).
+
+This directive does not affect the processing of informational (1xx), normal success (2xx), or redirect (3xx) responses.
+
+By default, all responses are sent as-is from the application or from the Phusion Passenger core. If you turn this option on then Apache will be able to handle such responses using the Apache `ErrorDocument` option.
+
+This option may occur in the following places:
+
+ * In the global server configuration.
+ * In a virtual host configuration block.
+ * In a `<Directory>` or `<Location>` block.
+ * In '.htaccess'.
+
+In each place, it may be specified at most once. The default value is 'off'.
+
 [[PassengerMaxRequestQueueSize]]
 ==== PassengerMaxRequestQueueSize <number> ====
 :version: 4.0.15
@@ -1637,6 +1665,13 @@ When all application processes are already handling their maximum number of conc
 
 A value of 0 means that the queue is unbounded.
 
+You may combine this with <<PassengerErrorOverride,PassengerErrorOverride>> and `ErrorDocument` to set a custom error page whenever the queue is full. In the following example, Apache will serve /error503.html whenever the queue is full:
+
+---------------------------------
+PassengerErrorOverride on
+ErrorDocument 504 /error504.html
+---------------------------------
+
 This option may occur in the following places:
 
  * In the global server configuration.

data/doc/Users guide Nginx.idmap.txt

@@ -116,7 +116,9 @@
 
 5.2. Deploying to a virtual host’s root	=>	deploying-to-a-virtual-host-s-root-1chcpbj
 
-5.3. Redeploying (restarting the WSGI application)	=>	redeploying-restarting-the-wsgi-application--10zdh2k
+5.3. Deploying to a sub URI	=>	deploying-to-a-sub-uri-5v6zmg
+
+5.4. Redeploying (restarting the WSGI application)	=>	redeploying-restarting-the-wsgi-application--10zdh2k
 
 6. Configuring Phusion Passenger	=>	configuring-phusion-passenger-1g1svey
 
@@ -126,111 +128,113 @@
 
 6.3. passenger_python <filename>	=>	passenger-python-filename--14p554
 
-6.4. passenger_app_root <path/to/root>	=>	passenger-app-root-path-to-root--1dbudc6
+6.4. passenger_nodejs <filename>	=>	passenger-nodejs-filename--16hzjsv
+
+6.5. passenger_app_root <path/to/root>	=>	passenger-app-root-path-to-root--1dbudc6
 
-6.5. passenger_spawn_method <string>	=>	passenger-spawn-method-string--1sc6njl
+6.6. passenger_spawn_method <string>	=>	passenger-spawn-method-string--1sc6njl
 
-6.6. passenger_load_shell_envvars <on|off>	=>	passenger-load-shell-envvars-on-off--fw5u4l
+6.7. passenger_load_shell_envvars <on|off>	=>	passenger-load-shell-envvars-on-off--fw5u4l
 
-6.7. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
+6.8. passenger_rolling_restarts <on|off>	=>	passenger-rolling-restarts
 
-6.8. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
+6.9. passenger_resist_deployment_errors <on|off>	=>	passenger-resist-deployment-errors-on-off--k9yf1
 
-6.9. passenger_temp_dir <directory>	=>	passenger-temp-dir-directory--1t3opri
+6.10. passenger_temp_dir <directory>	=>	passenger-temp-dir-directory--1t3opri
 
-6.10. passenger_fly_with <socket filename>	=>	passenger-fly-with-socket-filename--1amd1xn
+6.11. passenger_fly_with <socket filename>	=>	passenger-fly-with-socket-filename--1amd1xn
 
-6.11. Important deployment options	=>	important-deployment-options-av567
+6.12. Important deployment options	=>	important-deployment-options-av567
 
-6.11.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
+6.12.1. passenger_enabled <on|off>	=>	passenger-enabled-on-off--1rpb2t7
 
-6.11.2. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
+6.12.2. passenger_base_uri <uri>	=>	passenger-base-uri-uri--1xtuo50
 
-6.12. Connection handling options	=>	connection-handling-options-8jgq90
+6.13. Connection handling options	=>	connection-handling-options-8jgq90
 
-6.12.1. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
+6.13.1. passenger_ignore_client_abort <on|off>	=>	passenger-ignore-client-abort
 
-6.12.2. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
+6.13.2. passenger_set_cgi_param <CGI environment name> <value>	=>	passenger-set-cgi-param-cgi-environment-name-value--rx9gc0
 
-6.12.3. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
+6.13.3. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
 
-6.12.4. passenger_buffer_response <on|off>	=>	passenger-buffer-response
+6.13.4. passenger_buffer_response <on|off>	=>	passenger-buffer-response
 
-6.12.5. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
+6.13.5. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
 
-6.12.6. passenger_buffers	=>	passenger-busy-buffers
+6.13.6. passenger_buffers	=>	passenger-busy-buffers
 
-6.12.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
+6.13.7. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
 
-6.12.8. passenger_intercept_errors <on|off>	=>	passenger-intercept-errors-1uvcb9x
+6.13.8. passenger_intercept_errors <on|off>	=>	passenger-intercept-errors-1uvcb9x
 
-6.12.9. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--i0te1b
+6.13.9. passenger_max_request_queue_size <number>	=>	passenger-max-request-queue-size-number--i0te1b
 
-6.12.10. passenger_request_queue_overflow_status_code <code>	=>	passenger-request-queue-overflow-status-code-code--1wcwuxl
+6.13.10. passenger_request_queue_overflow_status_code <code>	=>	passenger-request-queue-overflow-status-code-code--1wcwuxl
 
-6.13. Security options	=>	security-options-1bv93g4
+6.14. Security options	=>	security-options-1bv93g4
 
-6.13.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
+6.14.1. passenger_user_switching <on|off>	=>	passenger-user-switching-on-off--1p37u3l
 
-6.13.2. passenger_user <username>	=>	passenger-user-username--b06ur7
+6.14.2. passenger_user <username>	=>	passenger-user-username--b06ur7
 
-6.13.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
+6.14.3. passenger_group <group name>	=>	passenger-user-group-name--1fco4j7
 
-6.13.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
+6.14.4. passenger_default_user <username>	=>	passenger-default-user-username--1h6cdmf
 
-6.13.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
+6.14.5. Passenger_default_group <group name>	=>	passenger-default-group-group-name--1qxn2qa
 
-6.13.6. passenger_show_version_in_header <on|off>	=>	passenger-show-version-in-header-on-off--2h49av
+6.14.6. passenger_show_version_in_header <on|off>	=>	passenger-show-version-in-header-on-off--2h49av
 
-6.13.7. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
+6.14.7. passenger_friendly_error_pages <on|off>	=>	passenger-friendly-error-pages-on-off--1ti1a0e
 
-6.14. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
+6.15. Resource control and optimization options	=>	resource-control-and-optimization-options-xd7evs
 
-6.14.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
+6.15.1. passenger_max_pool_size <integer>	=>	passenger-max-pool-size-integer--3jzefs
 
-6.14.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
+6.15.2. passenger_min_instances <integer>	=>	passenger-min-instances-integer--uclykt
 
-6.14.3. passenger_max_instances <integer>	=>	passenger-max-instances
+6.15.3. passenger_max_instances <integer>	=>	passenger-max-instances
 
-6.14.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
+6.15.4. passenger_max_instances_per_app <integer>	=>	passenger-max-instances-per-app-integer--1xhbbne
 
-6.14.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
+6.15.5. passenger_pool_idle_time <integer>	=>	passenger-pool-idle-time-integer--xcw65o
 
-6.14.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
+6.15.6. passenger_max_preloader_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
 
-6.14.7. passenger_start_timeout <seconds>	=>	passenger-start-timeout-seconds--8xn504
+6.15.7. passenger_start_timeout <seconds>	=>	passenger-start-timeout-seconds--8xn504
 
-6.14.8. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
+6.15.8. passenger_concurrency_model <process|thread>	=>	passenger-concurrency-model-process-thread--brcvkk
 
-6.14.9. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
+6.15.9. passenger_thread_count <number>	=>	passenger-thread-count-number--1kd6ffy
 
-6.14.10. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
+6.15.10. passenger_max_requests <integer>	=>	passenger-max-requests-integer--sgzint
 
-6.14.11. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
+6.15.11. passenger_max_request_time <seconds>	=>	passenger-max-request-time-seconds--1htog2g
 
-6.14.12. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
+6.15.12. passenger_memory_limit <integer>	=>	passenger-memory-limit-integer--1ry7dwx
 
-6.14.13. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
+6.15.13. passenger_pre_start <url>	=>	passenger-pre-start-url--npldeb
 
-6.15. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
+6.16. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
 
-6.15.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
+6.16.1. passenger_log_level <integer>	=>	passenger-log-level-integer--17snhon
 
-6.15.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
+6.16.2. passenger_debug_log_file <filename>	=>	passenger-debug-log-file-filename--21ubaj
 
-6.15.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
+6.16.3. passenger_debugger <on|off>	=>	passenger-debugger-on-off--1wkuq85
 
-6.16. Ruby on Rails-specific options	=>	ruby-on-rails-specific-options-12vfokt
+6.17. Ruby on Rails-specific options	=>	ruby-on-rails-specific-options-12vfokt
 
-6.16.1. rails_env <string>	=>	rails-env-string--jlh7v9
+6.17.1. rails_env <string>	=>	rails-env-string--jlh7v9
 
-6.17. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
+6.18. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
 
-6.17.1. rack_env <string>	=>	rack-env-string--tqmrt0
+6.18.1. rack_env <string>	=>	rack-env-string--tqmrt0
 
-6.18. Deprecated options	=>	deprecated-options-1dtzo0g
+6.19. Deprecated options	=>	deprecated-options-1dtzo0g
 
-6.18.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
+6.19.1. rails_spawn_method	=>	rails-spawn-method-17vdnpt
 
 7. Troubleshooting	=>	troubleshooting-1pt0c76
 

data/doc/Users guide Nginx.txt

@@ -67,7 +67,7 @@ Then restart Nginx. The application has now been deployed.
 [[deploying_rails_to_sub_uri]]
 === Deploying to a sub URI ===
 
-Suppose that you already have a 'server' virtual host entry:
+Suppose that you already have a virtual host for the application `/websites/phusion`:
 
 -------------------------------------------
 http {
@@ -77,23 +77,26 @@ http {
         listen 80;
         server_name www.phusion.nl;
         root /websites/phusion;
+        passenger_enabled on;
     }
 
     ...
 }
 -------------------------------------------
 
-And you want your Ruby on Rails application to be accessible from the URL
-'http://www.phusion.nl/rails'.
+And you want your Rails application, located in `/websites/rails`, to be accessible from the URL
+'http://www.phusion.nl/subapp'.
 
-To do this, make a symlink in the virtual host's document root, and have it
-point to your Ruby on Rails application's 'public' folder. For example:
--------------------------------------------
-ln -s /webapps/mycook/public /websites/phusion/rails
--------------------------------------------
+To do this, you need to perform the following:
+
+ 1. Create a `location <SUBURI>` block.
+ 2. Inside the location block, set `passenger_base_uri <SUBURI>`.
+ 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>`.
+ 4. Inside the location block, set `passenger_app_root <PATH TO YOUR APPLICATION ROOT>`.
+ 5. Inside the location block, re-specify `passenger_enabled on`.
+
+Here is an example:
 
-Next, set 'passenger_enabled on' and add a <<PassengerBaseURI,passenger_base_uri>>
-option to the 'server' block:
 -------------------------------------------
 http {
     ...
@@ -102,28 +105,21 @@ http {
         listen 80;
         server_name www.phusion.nl;
         root /websites/phusion;
-        passenger_enabled on;        # <--- These lines have
-        passenger_base_uri /rails;   # <--- been added.
+
+        # This block has been added.
+        location /subapp {
+            passenger_base_uri /subapp;
+            alias /websites/rails/public;  # <-- be sure to point to 'public'!
+            passenger_app_root /websites/rails;
+            passenger_enabled on;
+        }
     }
 
     ...
 }
 -------------------------------------------
-Then restart Nginx. The application has now been deployed.
 
-[TIP]
-======================================
-You can deploy multiple Rails applications under a virtual host, by specifying
-<<PassengerBaseURI,passenger_base_uri>> multiple times. For example:
----------------------------------
-server {
-    ...
-    passenger_base_uri /app1;
-    passenger_base_uri /app2;
-    passenger_base_uri /app3;
-}
----------------------------------
-======================================
+Then restart Nginx. The application has now been deployed on the sub-URI.
 
 === Redeploying (restarting the Ruby on Rails application) ===
 
@@ -262,7 +258,7 @@ Then restart Nginx. The application has now been deployed.
 [[deploying_rack_to_sub_uri]]
 === Deploying to a sub URI ===
 
-Suppose that you already have a virtual host:
+Suppose that you already have a virtual host for the application `/websites/phusion`:
 
 -------------------------------------------
 http {
@@ -279,17 +275,19 @@ http {
 }
 -------------------------------------------
 
-And you want your Rack application to be accessible from the URL
-'http://www.phusion.nl/rack'.
+And you want your Rack application, located in `/websites/rack`, to be accessible from the URL
+'http://www.phusion.nl/subapp'.
 
-To do this, make a symlink in the virtual host's document root, and have it
-point to your Rack application's 'public' folder. For example:
--------------------------------------------
-ln -s /webapps/rackapp/public /websites/phusion/rack
--------------------------------------------
+To do this, you need to perform the following:
+
+ 1. Create a `location <SUBURI>` block.
+ 2. Inside the location block, set `passenger_base_uri <SUBURI>`.
+ 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>`.
+ 4. Inside the location block, set `passenger_app_root <PATH TO YOUR APPLICATION ROOT>`.
+ 5. Inside the location block, re-specify `passenger_enabled on`.
+
+Here is an example:
 
-Next, set 'passenger_enabled on' and add a <<PassengerBaseURI,passenger_base_uri>>
-option to the 'server' block:
 -------------------------------------------
 http {
     ...
@@ -298,28 +296,20 @@ http {
         listen 80;
         server_name www.phusion.nl;
         root /websites/phusion;
-        passenger_enabled on;        # <--- These lines have
-        passenger_base_uri /rack;    # <--- been added.
+
+        # This block has been added.
+        location /subapp {
+            passenger_base_uri /subapp;
+            alias /websites/rack/public;  # <-- be sure to point to 'public'!
+            passenger_app_root /websites/rack;
+            passenger_enabled on;
+        }
     }
 
     ...
 }
 -------------------------------------------
-Then restart Nginx. The application has now been deployed.
-
-[TIP]
-======================================
-You can deploy multiple Rack applications under a virtual host, by specifying
-<<PassengerBaseURI,passenger_base_uri>> multiple times. For example:
----------------------------------
-server {
-    ...
-    passenger_base_uri /app1;
-    passenger_base_uri /app2;
-    passenger_base_uri /app3;
-}
----------------------------------
-======================================
+Then restart Nginx. The application has now been deployed on the sub-URI.
 
 === Redeploying (restarting the Rack application) ===
 
@@ -425,6 +415,63 @@ http {
 -------------------------------------------
 Then restart Nginx. The application has now been deployed.
 
+[[deploying_wsgi_to_sub_uri]]
+=== Deploying to a sub URI ===
+
+Suppose that you already have a virtual host for the application `/websites/phusion`:
+
+-------------------------------------------
+http {
+    ...
+
+    server {
+        listen 80;
+        server_name www.phusion.nl;
+        root /websites/phusion;
+        passenger_enabled on;
+    }
+
+    ...
+}
+-------------------------------------------
+
+And you want your WSGI application, located in `/websites/wsgi`, to be accessible from the URL
+'http://www.phusion.nl/subapp'.
+
+To do this, you need to perform the following:
+
+ 1. Create a `location <SUBURI>` block.
+ 2. Inside the location block, set `passenger_base_uri <SUBURI>`.
+ 3. Inside the location block, set `alias <PATH TO YOUR APPLICATION'S PUBLIC DIRECTORY>`.
+ 4. Inside the location block, set `passenger_app_root <PATH TO YOUR APPLICATION ROOT>`.
+ 5. Inside the location block, re-specify `passenger_enabled on`.
+
+Here is an example:
+
+-------------------------------------------
+http {
+    ...
+
+    server {
+        listen 80;
+        server_name www.phusion.nl;
+        root /websites/phusion;
+
+        # This block has been added.
+        location /subapp {
+            passenger_base_uri /subapp;
+            alias /websites/wsgi/public;  # <-- be sure to point to 'public'!
+            passenger_app_root /websites/wsgi;
+            passenger_enabled on;
+        }
+    }
+
+    ...
+}
+-------------------------------------------
+
+Then restart Nginx. The application has now been deployed on the sub-URI.
+
 === Redeploying (restarting the WSGI application) ===
 
 Deploying a new version of a WSGI application is as simple as
@@ -466,7 +513,7 @@ NOTE: This option has no effect when you are using <<flying_passenger,Flying Pas
 
 [[PassengerRuby]]
 === passenger_ruby <filename> ===
-The `passenger_ruby` option allows one to specify the Ruby interpreter to use. Similarly, the `passenger_python` option is for specifying the Python interpreter.
+The `passenger_ruby` option allows one to specify the Ruby interpreter to use. Similarly, the `passenger_python` and `passenger_nodejs` options are for specifying the Python interpreter and Node.js commands, respectively.
 
 In versions prior to 4.0.0, only a single Ruby version was supported for the entire Nginx instance, so `passenger_ruby` may only occur in the global server configuration. Also, the `passenger_python` option was not supported.
 
@@ -481,9 +528,9 @@ The `passenger_ruby` in the `http` block - that is, the one that `passenger-inst
 
 The `passenger_ruby` directive in the `http` block is also used as the default Ruby interpreter for Ruby web apps. You don't *have* to specify a `passenger_ruby` in the `http` block though, because the default is to use the first `ruby` command found in `$PATH`.
 
-The `passenger_python` option works in a similar manner, but applies to Python instead.
+The `passenger_python` and `passenger_nodejs` options works in a similar manner, but apply to Python and Node.js instead.
 
-You can also override `passenger_ruby` or `passenger_python` in specific contexts if you want to use a different Ruby/Python interpreter for that web app. For example:
+You can also override `passenger_ruby` and other directives in specific contexts if you want to use a different interpreter for that web app. For example:
 
 ------------------------------
 http {
@@ -493,6 +540,8 @@ http {
     passenger_ruby /usr/bin/ruby1.8;
     # Use Python 2.6 by default.
     passenger_python /usr/bin/python2.6;
+    # Use /usr/bin/node by default.
+    passenger_nodejs /usr/bin/node;
 
     server {
         # This Rails web app will use Ruby 1.8.7
@@ -538,6 +587,12 @@ include::users_guide_snippets/since_version.txt[]
 
 This option allows one to specify the Python interpreter to use. See <<PassengerRuby,passenger_ruby>> for more information. The default value is 'python', meaning that the Python interpreter will be looked up according to the `PATH` environment variable.
 
+=== passenger_nodejs <filename> ===
+:version: 4.0.24
+include::users_guide_snippets/since_version.txt[]
+
+This option allows one to specify the Node.js command to use. See <<PassengerRuby,passenger_ruby>> for more information. The default value is 'node', meaning that the Node.js command will be looked up according to the `PATH` environment variable.
+
 [[PassengerAppRoot]]
 === passenger_app_root <path/to/root> ===
 :version: 4.0.0
@@ -755,9 +810,12 @@ server {
 [[PassengerBaseURI]]
 ==== passenger_base_uri <uri> ====
 Used to specify that the given URI is an distinct application that should
-be served by Phusion Passenger. This option can be used for both Rails and
-Rack applications. See <<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>>
-for an example.
+be served by Phusion Passenger. Please refer to the following sections for
+more information:
+
+ * <<deploying_rack_to_sub_uri,Deploying Rack to a sub URI>>
+ * <<deploying_wsgi_to_sub_uri,Deploying WSGI to a sub URI>>
+ * <<deploying_rails_to_sub_uri,Deploying Rails 1 and Rails 2 to a sub URI>>
 
 It is allowed to specify this option multiple times. Do this to deploy multiple
 applications in different sub-URIs under the same virtual host.
@@ -793,12 +851,17 @@ This option may occur in the following places:
 In each place, it may be specified at most once. The default value is 'off'.
 
 ==== passenger_set_cgi_param <CGI environment name> <value> ====
-Allows one to define additional CGI environment variables to pass to the backend
-application. This is equivalent to ngx_http_fastcgi_module's 'fastcgi_param'
-directive, and is comparable to ngx_http_proxy_module's 'proxy_set_header' option.
+Allows one to define additional CGI environment variables to pass to the web
+application. This is comparable to ngx_http_fastcgi_module's 'fastcgi_param'
+directive, and to ngx_http_proxy_module's 'proxy_set_header' option.
 Nginx variables in the value are interpolated.
 
-For example:
+These variables passed in the following manner:
+
+ * On every request, in the form of a request variable.
+ * During application spawning, in the form of a system environment variable that can be looked up through `getenv()`.
+
+Example usage:
 ------------------------------
 # Application will see a CGI environment "APP_NAME" with value "my super blog".
 passenger_set_cgi_param APP_NAME "my super blog";