passenger 4.0.24 → 4.0.25

data/ext/nginx/MergeLocationConfig.c

@@ -177,3 +177,21 @@
 			NGX_CONF_UNSET);
 	
 
+	
+		ngx_conf_merge_str_value(conf->restart_dir,
+			prev->restart_dir,
+			NULL);
+	
+
+	
+		ngx_conf_merge_str_value(conf->app_type,
+			prev->app_type,
+			NULL);
+	
+
+	
+		ngx_conf_merge_str_value(conf->startup_file,
+			prev->startup_file,
+			NULL);
+	
+

data/helper-scripts/node-loader.js

@@ -112,7 +112,8 @@ function configure(_options) {
 }
 
 function loadApplication() {
-	require(PhusionPassenger.options.app_root + '/app.js');
+	var startupFile = PhusionPassenger.options.startup_file || 'app.js';
+	require(PhusionPassenger.options.app_root + '/' + startupFile);
 }
 
 function extractCallback(args) {

data/lib/phusion_passenger.rb

@@ -30,10 +30,10 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.24'
+	VERSION_STRING = '4.0.25'
 	
-	PREFERRED_NGINX_VERSION = '1.4.3'
-	NGINX_SHA256_CHECKSUM = 'ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'
+	PREFERRED_NGINX_VERSION = '1.4.4'
+	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'
 
 	PREFERRED_PCRE_VERSION  = '8.32'
 	PCRE_SHA256_CHECKSUM = 'd5d8634b36baf3d08be442a627001099583b397f456bc795304a013383b6423a'

data/lib/phusion_passenger/constants.rb

@@ -64,7 +64,7 @@ module PhusionPassenger
 		PASSENGER_VERSION = PhusionPassenger::VERSION_STRING
 		SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 1
 		SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 0
-		SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION = 2
+		SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION = 3
 		SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION = 0
 
 		# Misc

data/lib/phusion_passenger/nginx/config_options.rb

@@ -250,6 +250,19 @@ LOCATION_CONFIGURATION_OPTIONS = [
 		:name  => 'passenger_request_queue_overflow_status_code',
 		:type  => :integer
 	},
+	{
+		:name  => 'passenger_restart_dir',
+		:type  => :string
+	},
+	{
+		:name   => 'passenger_app_type',
+		:type   => :string,
+		:header => nil
+	},
+	{
+		:name   => 'passenger_startup_file',
+		:type   => :string
+	},
 
 	###### Enterprise features ######
 	{

data/lib/phusion_passenger/standalone/start_command.rb

@@ -146,8 +146,17 @@ private
 				@options[:environment] = value
 			end
 			opts.on("-R", "--rackup FILE", String,
-				wrap_desc("If Rack application detected, run this rackup file")) do |value|
-				ENV["RACKUP_FILE"] = value
+				wrap_desc("Consider application a Ruby Rack app, and use the given rackup file")) do |value|
+				@options[:app_type] = "rack"
+				@options[:startup_file] = value
+			end
+			opts.on("--app-type NAME", String,
+				wrap_desc("Force app to be detected as the given type")) do |value|
+				@options[:app_type] = value
+			end
+			opts.on("--startup-file FILENAME", String,
+				wrap_desc("Force given startup file to be used")) do |value|
+				@options[:startup_file] = value
 			end
 			opts.on("--max-pool-size NUMBER", Integer,
 				wrap_desc("Maximum number of application processes (default: #{@options[:max_pool_size]})")) do |value|
@@ -193,6 +202,14 @@ private
 				wrap_desc("Specify the SSL key path")) do |val|
 				@options[:ssl_certificate_key] = File.expand_path(val)
 			end
+			opts.on("--static-files-dir PATH", String,
+				wrap_desc("Specify the static files dir")) do |val|
+				@options[:static_files_dir] = File.expand_path(val)
+			end
+			opts.on("--restart-dir PATH", String,
+				wrap_desc("Specify the restart dir")) do |val|
+				@options[:restart_dir] = File.expand_path(val)
+			end
 			opts.on("--union-station-gateway HOST:PORT", String,
 				wrap_desc("Specify Union Station Gateway host and port")) do |value|
 				host, port = value.split(":", 2)

data/lib/phusion_passenger/utils/tmpdir.rb

@@ -57,7 +57,6 @@ protected
 			system("mkdir", "-p", "-m", "u=rwxs,g=rwx,o=rwx", dir)
 			system("mkdir", "-p", "-m", "u=rwxs,g=rwx,o=rwx", "#{dir}/generation-0")
 			system("mkdir", "-p", "-m", "u=rwxs,g=rwx,o=rwx", "#{dir}/backends")
-			system("mkdir", "-p", "-m", "u=rwxs,g=rwx,o=rwx", "#{dir}/spawn-server")
 		end
 		return dir
 	end

data/resources/templates/standalone/config.erb

@@ -89,14 +89,21 @@ http {
     server {
         listen <%= nginx_listen_address(app) %> <%= "ssl" if app[:ssl] %>;
         server_name <%= app[:server_names].join(' ') %>;
-        root '<%= app[:root] %>/public';
+        <% if app[:static_files_dir] %>
+            root '<%= app[:static_files_dir] %>';
+        <% else %>
+            root '<%= app[:root] %>/public';
+        <% end %>
         passenger_app_root '<%= app[:root] %>';
         passenger_enabled on;
         passenger_app_env <%= app[:environment] %>;
         passenger_spawn_method <%= app[:spawn_method] %>;
+        <% if app[:app_type] %>passenger_app_type <%= app[:app_type] %>;<% end %>
+        <% if app[:startup_file] %>passenger_startup_file <%= app[:startup_file] %>;<% end %>
         <% if app[:concurrency_model] != DEFAULT_CONCURRENCY_MODEL %>passenger_concurrency_model <%= app[:concurrency_model] %>;<% end %>
         <% if app[:thread_count] != DEFAULT_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
+        <% if app[:restart_dir] %>passenger_restart_dir '<%= app[:restart_dir] %>';<% end %>
         <% if app[:union_station_key] %>
             union_station_support on;
             union_station_key <%= app[:union_station_key] %>;

data/test/integration_tests/native_packaging_spec.rb

@@ -80,10 +80,6 @@ describe "A natively packaged Phusion Passenger" do
 		end
 	end
 
-	specify "passenger-install-nginx-module is in #{BINDIR}" do
-		which("passenger-install-nginx-module").should == "#{BINDIR}/passenger-install-nginx-module"
-	end
-
 	specify "passenger-status is in #{SBINDIR}" do
 		which("passenger-status").should == "#{SBINDIR}/passenger-status"
 	end
@@ -209,6 +205,20 @@ describe "A natively packaged Phusion Passenger" do
 		end
 	end
 
+	describe "passenger-install-nginx-module" do
+		it "is in #{BINDIR}" do
+			which("passenger-install-nginx-module").should == "#{BINDIR}/passenger-install-nginx-module"
+		end
+
+		it "is able to compile Nginx" do
+			Dir.mktmpdir do |path|
+				output = capture_output("passenger-install-nginx-module --auto --prefix=#{path} --auto-download 2>&1")
+				output.should include("passenger_root #{LOCATIONS_INI};")
+				File.exist?("#{path}/sbin/nginx").should be_true
+			end
+		end
+	end
+
 	describe "Passenger Standalone" do
 		it "is in #{BINDIR}" do
 			which("passenger").should == "#{BINDIR}/passenger"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.24
+  version: 4.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,6 +222,7 @@ files:
 - doc/images/many_web_framework_protocols.png
 - doc/images/passenger_architecture.png
 - doc/images/passenger_architecture.svg
+- doc/images/passenger_nodejs_architecture.svg
 - doc/images/phusion_banner.png
 - doc/images/phusion_banner_small.png
 - doc/images/rack.png

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJShLLBAAoJECrHRaUKISqMJkkH/Ri041qnkbOu6pOtq3+IzZ3f
-v13K+rVcMojVkSFGbbSeuYNYKkFZuHz/kDqJLjtU4OU3W+9ANl3DxhQ0IB/dwVHv
-N9TK10QnWspJb2wLPzoUFSe72t/kHRmjOmvwJGMzJS2cgHMnCT2BjVLSBLCYo/Iw
-G2pyj2BakrES0GHCL2qfD2lx5JXQM7yZb+hRmIzHA7k9kb1KjjCNKg4aw3fcpGBk
-Uq9V7He9zasHZklDTJoUk7vzffqF8GoszvSbN6G54Bxk2p2OZwbEL4B37bsUe58B
-aQQTVHd3M8HPw//fv91l9wX+5qxl6dwfn0KEohUpURNHcp8UhPLI7/znQcjAuZA=
-=CVJw
+iQEcBAABAgAGBQJSi8RJAAoJECrHRaUKISqMj44IAKnWeRi84E9hLRSt9NRodG7p
+GURP17hpIVDD3A7tXLvO6wQD1gIeTvcrY1GbEdFlnFqZxSln0w9tOZUyQ1b1UcNf
+cUYWgKTgLGN4HxwYH4NM+eMytsAaIyrtmSLfSwp6y/QpQkcK+iZtjhA+VxcKY8uv
+G220agtA4Bxiuu02C7/uIsK+J+byw0s1xXbwe+KWzGj+5vePFL2tnkQBTDoYImgU
+6johpD5HedqdiwS6ncf9fKd9ZZNWmUct7IK7agdbXwVY8TTqkeAe3A0oxBaiSwJj
+u0qC91C8Oip2K35IknG18UxrO8hgJ7In2KUqkJaoIUajXM8xBlRQI3rsSt4iIZU=
+=nCXi
 -----END PGP SIGNATURE-----