passenger 5.0.11 → 5.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjFiNWQ0MmNkOTQ1MWMzNzNiNmY1NTE0ZDQ2YTM3YzJhNTA0ZDU2OQ==
+    YWNmODU4ZmM3Zjk1YjliNGU3MWNlZmQyMzNkMmJmMzNkNWU3YzdjMg==
   data.tar.gz: !binary |-
-    OGRhYmI2NzNiOThlYWM2YWMwOWEyMWU1MDUyNTJkYWM0NmIzMzBjMg==
+    YjlkZmM4YTUxZWNjMmE2YTY1OTJjZTllMjgwZWFiNmY2MGVlNDJjNw==
 SHA512:
   metadata.gz: !binary |-
-    ZGJmZjE1YTQzYTg1NTU5YmE2NTE2YjFhZGFhNmZjMzc0NzQ1MmFhOTZjOGVh
-    ZjQzMDIyNjcxNmIyZjdkNjQxZmMwNDgwNWI2MmQ3MDlkZGYzZmU2OTk3YzM0
-    ZmYyMjAzMTc4NDdlYzQxYzdhODBlY2NjMjYxNzQ1OWE2MDg1OTg=
+    NDc5YTA5MjRjOTdiZDlkNGIyN2EyZDcxOTFiNzcyYWU5ZjY4OWMyZWQ0YjBj
+    NmY4ZjMxNzY0ZDIwMDQwOWQ4OWE3NTFlZTZiZGFjNTg3Yzk2ZTQ5MGNkZDI0
+    MWM0MTBkYWM5NTRhNzYzM2NjMjc1YzMwYmFiYjM2MzI3ODVlNDg=
   data.tar.gz: !binary |-
-    NDcwOTRlZDkwYmExOTQyZWEwNDlhODhhNDQ4MzczYTQwYTA5MjYzNzA2ZjE1
-    NTYwZWQ5OWIyMWYyZjUxMjUxY2YwMTk4YzAyMDMzNDM1YTE5ZmIzOTIyZmRh
-    YzFlZDljMzE1MGFmMmI2MmU2MTE1NWZkZDQwMzMzNWIxNGI0MDc=
+    YzJiNmM4Y2FjOTM4ZTk3NDZlYTA3Y2I5MmEzODMyYzQ0Y2QyZDlmNDkzODY3
+    MTQ2NDRmZTA4YjM5M2I5ZGYyNzE4Mzk0NGNjMWNjZTQwZWVjM2U4Yzc3ZWY0
+    NTliODY0ZDFmODNlMmMxNDg3MDliYTFjMGFiYTM4N2ZmNmMxOGM=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJViQ+SAAoJECrHRaUKISqM604H/RrRMSPP09EbJhX94f6wNDDt
-jfNeVx773mN/GryyVv2i4cpos24uqLTwPi8JVWkNSRqD2+bmDUL7M5yXnS+J89zB
-/3F/TXRUAtB+2eH9NpzT6WPQx5A6vNXK1ovQSk/BmkVXIm3TXl9xtVgTWaT91tOP
-DvW7ZFVhwG41FGiR1+jU6lA6f8rc2ion32lqNAI6ZvFN0ro5+vjT7AqaR6JmDmn6
-vhan8iNa0J1B91FjN1n0eIQo/2yOJvoLBLuUe117uNtuoPCw4CMZXUL+Yo1OhdoC
-8JOQidQIJ11obEhvk06UjSnLssB0vFrDlNO1zdkRLrNp8mTmjhFsUZQDByMSyLk=
-=0i9C
+iQEcBAABAgAGBQJVlbSXAAoJECrHRaUKISqMnY4H/0mq05PDibFb5mZEoNx2fxAX
+3EZiHtDSMvgnMTDYVcUVQlXZlBHZMgUdkjTzNNhbzy2+/rjJDOhwK6qrWUXBoS4T
+uoOBcjGjrAQewkbjgBTLXUl8lFn7ZPK9NbaoHKqcrEtCyCFGpRTZe5aK3g4+/VAj
+ml4lZ1ANC1MET22SYR4/FNTu6jH+upUJKZlkNWuFq/7BcNrwGbOFVtp+9jnm699a
+yXnNpPGVcgba+5Zxvzs7gTPq62ReaBYhOB4iW2G7i5xl4Hz8wCKggA/YxdCAT1Dw
+Qm6acCJt85Fjanf1I46GSGBA5WurDadX7NwFw3MdrSHsizbDIw1PoBDNID8CCTY=
+=b/iP
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJViQ+SAAoJECrHRaUKISqMrPsIAIotbspFEsXcIDrDK5Fzzdk8
-/LpiPwn3tsH9ieSasBJnwNmjFWrMp5slr8ta67EqSW+pnP7wmw2EsK7/J9kLDP8c
-UtLFCBm7eAju4CmprZhu2UtqrpwiOZgSLk0Ze8HuIPE4dnYxa9N69HSeOtSyW4lO
-J2TzUC1/QZJSmLG4WXPyBah6e6sFhZdoHGge78xCsoQR8fspAj1p7t6TBmESVAmA
-MW7A0ZPXlXRdw0N3OaTK9vnG+Y1UtMmN45PD4NjZHpntOB3wcWv+Sm8nYRWzFdAx
-hjKsZFLqQHkNXfcsVdCeStyzEcbmdE8fbUSBDPtjDVPlicD2AvHjG4rMOdgOZ1s=
-=UBLz
+iQEcBAABAgAGBQJVlbSXAAoJECrHRaUKISqMvv0H/3EdFquHBvaanNXhPdyGC3BJ
+N9IgjHe9PrHrrAATNAWOeGeiLzeiusWWm1t4SHfMsTfY7u7YICQBVkMvum/JQiZY
+E1ms/79bBHz7oeDq9J5PAlmqXCZZ8KGg3eNlVJm3ASZIydjL+8i0EciQcrDpYiMV
+5daAummZTuS932whowpdIYd0zqdtqIKtlRq6IVYrhPGfSiIDCSjVMEkf4gl1uhKx
+hzyGkGPIg4XUKhjPpiddAVlahiWdshDiytxXV4qeholJycXjZYAUL0DxLgkOyU1F
+9yCM2r5uXB/pQpwo+sOFgrjDSUr3zYkO3uMUUogO78rOIgcnJ2WMXZTz/0Oo2TM=
+=VV1v
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,18 @@
+Release 5.0.13
+--------------
+
+ * The `passenger-config restart-app` command now supports the option `--ignore-passenger-not-running`. If this option is given, the command will exit normally instead of exiting with an error, if Passenger is not running. This option is useful in deployments involving Passenger Standalone. In an initial deployment, Passenger Standalone may not yet be running. Passenger this option allows you to ignore that issue.
+ * SELinux policy issues in the RPMs have been fixed.
+ * [Apache] `passenger-config reopen-logs` didn't work on Apache unless you explicitly set `PassengerLogFile`. This has now been fixed.
+ * [Standalone] Due to some internal refactorings, the Passenger Standalone Nginx configuration template has changed. If you used a custom Nginx configuration template, please merge our latest changes into it.
+
+
+Release 5.0.12
+--------------
+
+ * [Enterprise] Fixed passenger-irb. It was broken in 5.0.10 because of the change that made using admin commands without sudo possible.
+
+
 Release 5.0.11
 --------------
 

data/bin/passenger-status

@@ -114,7 +114,7 @@ def show_status(instance, options)
   when 'pool'
     request = Net::HTTP::Get.new("/pool.txt?colorize=#{options[:color]}&verbose=#{options[:verbose]}")
     try_performing_ro_admin_basic_auth(request, instance)
-    response = instance.http_request("agents.s/server_api", request)
+    response = instance.http_request("agents.s/core_api", request)
     if response.code.to_i / 100 == 2
       puts response.body
     elsif response.code.to_i == 401
@@ -133,7 +133,7 @@ def show_status(instance, options)
   when 'requests', 'server'
     request = Net::HTTP::Get.new("/server.json")
     try_performing_ro_admin_basic_auth(request, instance)
-    response = instance.http_request("agents.s/server_api", request)
+    response = instance.http_request("agents.s/core_api", request)
     if response.code.to_i / 100 == 2
       puts response.body
     elsif response.code.to_i == 401
@@ -148,7 +148,7 @@ def show_status(instance, options)
   when 'backtraces'
     request = Net::HTTP::Get.new("/backtraces.txt")
     try_performing_ro_admin_basic_auth(request, instance)
-    response = instance.http_request("agents.s/server_api", request)
+    response = instance.http_request("agents.s/core_api", request)
     if response.code.to_i / 100 == 2
       text = response.body
       # Colorize output
@@ -168,7 +168,7 @@ def show_status(instance, options)
   when 'xml'
     request = Net::HTTP::Get.new("/pool.xml?secrets=#{options[:verbose]}")
     try_performing_ro_admin_basic_auth(request, instance)
-    response = instance.http_request("agents.s/server_api", request)
+    response = instance.http_request("agents.s/core_api", request)
     if response.code.to_i / 100 == 2
       indented = format_with_xmllint(response.body)
       if indented
@@ -193,7 +193,7 @@ def show_status(instance, options)
   when 'union_station'
     request = Net::HTTP::Get.new("/status.txt")
     try_performing_ro_admin_basic_auth(request, instance)
-    response = instance.http_request("agents.s/logging_api", request)
+    response = instance.http_request("agents.s/ust_router_api", request)
     if response.code.to_i / 100 == 2
       puts response.body
     elsif response.code.to_i == 401

data/ext/apache2/Hooks.cpp

@@ -1287,12 +1287,11 @@ public:
 
 		VariantMap params;
 		params
-			.setPid ("web_server_pid", getpid())
+			.setPid ("web_server_control_process_pid", getpid())
 			.setStrSet("web_server_config_files", getConfigFiles(s))
 			.set    ("server_software", webServerDesc)
 			.setBool("multi_app", true)
 			.setBool("load_shell_envvars", true)
-			.set    ("log_file", (serverConfig.logFile == NULL) ? "" : serverConfig.logFile)
 			.set    ("file_descriptor_log_file", (serverConfig.fileDescriptorLogFile == NULL)
 				? "" : serverConfig.fileDescriptorLogFile)
 			.set    ("data_buffer_dir", serverConfig.dataBufferDir)
@@ -1313,6 +1312,29 @@ public:
 			.set    ("union_station_proxy_address", serverConfig.unionStationProxyAddress)
 			.setBool("turbocaching", serverConfig.turbocaching)
 			.setStrSet("prestart_urls", serverConfig.prestartURLs);
+
+		if (serverConfig.logFile != NULL) {
+			params.set("log_file", serverConfig.logFile);
+		} else if (s->error_fname == NULL) {
+			throw ConfigurationException("Cannot initialize " PROGRAM_NAME
+				" because Apache is not configured with an error log file."
+				" Please either configure Apache with an error log file"
+				" (with the ErrorLog directive), or configure "
+				PROGRAM_NAME " with a `PassengerLogFile` directive.");
+		} else if (s->error_fname[0] == '|') {
+			throw ConfigurationException("Apache is configured to log to a pipe,"
+				" so " SHORT_PROGRAM_NAME " cannot be initialized because it doesn't"
+				" support logging to a pipe. Please configure " SHORT_PROGRAM_NAME
+				" with an explicit log file using the `PassengerLogFile` directive.");
+		} else if (strcmp(s->error_fname, "syslog") == 0) {
+			throw ConfigurationException("Apache is configured to log to syslog,"
+				" so " SHORT_PROGRAM_NAME " cannot be initialized because it doesn't"
+				" support logging to syslog. Please configure " SHORT_PROGRAM_NAME
+				" with an explicit log file using the `PassengerLogFile` directive.");
+		} else {
+			params.set("log_file", ap_server_root_relative(pconf, s->error_fname));
+		}
+
 		serverConfig.ctl.addTo(params);
 
 		agentsStarter.start(serverConfig.root, params);

data/ext/common/AgentsStarter.h

@@ -35,7 +35,8 @@
 
 typedef enum {
 	AS_APACHE,
-	AS_NGINX
+	AS_NGINX,
+	AS_STANDALONE
 } PP_AgentsStarterType;
 
 typedef void PP_AgentsStarter;
@@ -289,6 +290,19 @@ public:
 		return pid;
 	}
 
+	const char *getIntegrationModeString() const {
+		switch (type) {
+		case AS_APACHE:
+			return "apache";
+		case AS_NGINX:
+			return "nginx";
+		case AS_STANDALONE:
+			return "standalone";
+		default:
+			return "unknown";
+		}
+	}
+
 	// The 'const string &' here is on purpose. The C getter functions
 	// return the string pointer directly.
 	const string &getCoreAddress() const {
@@ -341,9 +355,9 @@ public:
 
 		VariantMap params;
 		params
-			.set    ("web_server_type", type == AS_APACHE ? "apache" : "nginx")
-			.setPid ("web_server_pid",  getpid())
+			.setPid ("web_server_control_process_pid",  getpid())
 			.set    ("web_server_passenger_version", PASSENGER_VERSION)
+			.set    ("integration_mode", getIntegrationModeString())
 			.set    ("passenger_root",  passengerRoot)
 			.setInt ("log_level",       getLogLevel());
 		extraParams.addTo(params);

data/ext/common/Constants.h

@@ -124,7 +124,7 @@
 
 	#define PASSENGER_DEFAULT_USER "nobody"
 
-	#define PASSENGER_VERSION "5.0.11"
+	#define PASSENGER_VERSION "5.0.13"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 
@@ -142,11 +142,11 @@
 
 	#define RPM_NGINX_PACKAGE "nginx"
 
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 2
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 3
 
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 3
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 0
 
-	#define SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION 3
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION 0
 
 	#define SERVER_KIT_MAX_SERVER_ENDPOINTS 4
 

data/ext/common/agent/UstRouter/Main.cpp

@@ -500,7 +500,6 @@ setAgentsOptionsDefaults() {
 static void
 sanityCheckOptions() {
 	VariantMap &options = *agentsOptions;
-	string webServerType = options.get("web_server_type", false);
 	bool ok = true;
 
 	if (!options.has("passenger_root")) {

data/ext/common/agent/Watchdog/Main.cpp

@@ -799,6 +799,10 @@ setAgentsOptionsDefaults() {
 		options.set("default_group",
 			inferDefaultGroup(options.get("default_user")));
 	}
+	options.setDefault("integration_mode", "standalone");
+	if (options.get("integration_mode") == "standalone") {
+		options.setDefault("standalone_engine", "builtin");
+	}
 	options.setDefault("server_software", SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 	options.setDefaultStrSet("cleanup_pidfiles", vector<string>());
 	options.setDefault("data_buffer_dir", getSystemTempDir());
@@ -988,7 +992,11 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 	instanceOptions.defaultUid = wo->defaultUid;
 	instanceOptions.defaultGid = wo->defaultGid;
 	instanceOptions.properties["name"] = wo->randomGenerator.generateAsciiString(8);
+	instanceOptions.properties["integration_mode"] = options.get("integration_mode");
 	instanceOptions.properties["server_software"] = options.get("server_software");
+	if (options.get("integration_mode") == "standalone") {
+		instanceOptions.properties["standalone_engine"] = options.get("standalone_engine");
+	}
 	if (options.has("web_server_config_files")) {
 		vector<string> configFiles = options.getStrSet("web_server_config_files");
 		Json::Value array(Json::arrayValue);
@@ -1149,89 +1157,6 @@ initializeApiServer(const WorkingObjectsPtr &wo) {
 	}
 }
 
-static void
-createCompatSymlinks(const WorkingObjectsPtr &wo) {
-	/* To maintain backward compatibility with older versions of
-	 * passenger-status etc, we create compatibility symlinks.
-	 */
-	int ret, e;
-	string instanceDir = wo->instanceDir->getPath() + "/";
-	string prefix = wo->instanceDir->getPath() + "/agents.s/";
-
-	do {
-		ret = symlink("watchdog_api", (prefix + "watchdog").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + prefix + "watchdog",
-			e, prefix + "watchdog");
-	}
-
-	do {
-		ret = symlink("core", (prefix + "server").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + prefix + "server",
-			e, prefix + "server");
-	}
-
-	do {
-		ret = symlink("core_api", (prefix + "server_admin").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + prefix + "server_admin",
-			e, prefix + "server_admin");
-	}
-
-	do {
-		ret = symlink("core_api", (prefix + "server_api").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + prefix + "server_api",
-			e, prefix + "server_api");
-	}
-
-	do {
-		ret = symlink("ust_router", (prefix + "logging").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + prefix + "logging",
-			e, prefix + "logging");
-	}
-
-	do {
-		ret = symlink("ust_router_api", (prefix + "logging_admin").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + prefix + "logging_admin",
-			e, prefix + "logging_admin");
-	}
-
-	do {
-		ret = symlink("ust_router_api", (prefix + "logging_api").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + prefix + "logging_api",
-			e, prefix + "logging_api");
-	}
-
-
-	do {
-		ret = symlink("core.pid", (instanceDir + "server.pid").c_str());
-	} while (ret == -1 && errno == EAGAIN);
-	if (ret == -1) {
-		e = errno;
-		throw FileSystemException("Cannot create symlink: " + instanceDir + "logging_api",
-			e, instanceDir + "server.pid");
-	}
-}
-
 static void
 startAgents(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers) {
 	TRACE_POINT();
@@ -1362,7 +1287,6 @@ watchdogMain(int argc, char *argv[]) {
 		initializeWorkingObjects(wo, instanceDirToucher, uidBeforeLoweringPrivilege);
 		initializeAgentWatchers(wo, watchers);
 		initializeApiServer(wo);
-		createCompatSymlinks(wo);
 		UPDATE_TRACE_POINT();
 		runHookScriptAndThrowOnError("before_watchdog_initialization");
 	} catch (const std::exception &e) {

data/ext/nginx/ngx_http_passenger_module.c

@@ -113,14 +113,14 @@ pp_variant_map_set_ngx_str(PP_VariantMap *m,
 }
 
 /**
- * Save the Nginx master process's PID into a file under the server instance directory.
+ * Save the Nginx master process's PID into a file in the instance directory.
+ * This PID file isn't currently used, but it might be useful for future tooling.
  *
- * A bug/limitation in Nginx doesn't allow us to create the server instance dir
- * *after* Nginx has daemonized, so the server instance dir's filename contains Nginx's
- * PID before daemonization. Normally PhusionPassenger::AdminTools::ServerInstance (used
- * by e.g. passenger-status) will think that the server instance dir is stale because the
- * PID in the filename doesn't exist. This PID file tells AdminTools::ServerInstance
- * what the actual PID is.
+ * The master process's PID is already passed to the Watchdog through the
+ * "web_server_control_process_pid" property, but that isn't enough. The Watchdog
+ * is started *before* Nginx has daemonized, so after Nginx has daemonized,
+ * the PID that we passed to the Watchdog is no longer valid. We fix that by
+ * creating this PID file after daemonization.
  */
 static ngx_int_t
 save_master_process_pid(ngx_cycle_t *cycle) {
@@ -128,7 +128,7 @@ save_master_process_pid(ngx_cycle_t *cycle) {
     u_char *last;
     FILE *f;
 
-    last = ngx_snprintf(filename, sizeof(filename) - 1, "%s/control_process.pid",
+    last = ngx_snprintf(filename, sizeof(filename) - 1, "%s/web_server_control_process.pid",
                         pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
     *last = (u_char) '\0';
 
@@ -277,7 +277,7 @@ start_watchdog(ngx_cycle_t *cycle) {
         }
     }
 
-    pp_variant_map_set_int    (params, "web_server_pid", getpid());
+    pp_variant_map_set_int    (params, "web_server_control_process_pid", getpid());
     pp_variant_map_set_strset (params, "web_server_config_files", (const char **) &config_file, 1);
     pp_variant_map_set        (params, "server_software", NGINX_VER, strlen(NGINX_VER));
     pp_variant_map_set_bool   (params, "multi_app", 1);
@@ -338,12 +338,12 @@ start_watchdog(ngx_cycle_t *cycle) {
         goto cleanup;
     }
 
-    /* Create the file instance_dir + "/control_process.pid"
+    /* Create the file instance_dir + "/web_server_control_process.pid"
      * and make it writable by the worker processes. This is because
      * save_master_process_pid is run after Nginx has lowered privileges.
      */
     last = ngx_snprintf(filename, sizeof(filename) - 1,
-                        "%s/control_process.pid",
+                        "%s/web_server_control_process.pid",
                         pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, (const u_char *) "", 0) != NGX_OK) {

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.11'
+  VERSION_STRING = '5.0.13'
 
   PREFERRED_NGINX_VERSION = '1.8.0'
   NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'

data/lib/phusion_passenger/config/api_call_command.rb

@@ -63,14 +63,14 @@ module PhusionPassenger
           opts.separator "  PATH is the admin URI. You can pass POST data with '-d'."
           opts.separator ""
           opts.separator "  Example 1: passenger-config api-call GET /server.json"
-          opts.separator "  Sends the 'GET /server.json' command to the HTTP server agent."
+          opts.separator "  Sends the 'GET /server.json' command to the Passenger core process."
           opts.separator ""
           opts.separator "  Example 2: passenger-config api-call PUT /config.json \\"
           opts.separator "             -d '{\"log_level\", 7}'"
-          opts.separator "  Sends the 'PUT /config.json' command to the HTTP server agent, with the"
-          opts.separator "  given PUT data."
+          opts.separator "  Sends the 'PUT /config.json' command to the Passenger core process, with"
+          opts.separator "  the given PUT data."
           opts.separator ""
-          opts.separator "  Example 3: passenger-config api-call POST /shutdown.json -a watchdog"
+          opts.separator "  Example 3: passenger-config api-call POST /shutdown.json -a watchdog_api"
           opts.separator "  Sends the 'POST /shutdown.json' command to the watchdog, with no POST data."
           opts.separator ""
           opts.separator "  Example 4: passenger-config api-call POST /shutdown.json \\"

data/lib/phusion_passenger/config/detach_process_command.rb

@@ -92,7 +92,7 @@ module PhusionPassenger
         try_performing_full_admin_basic_auth(request, @instance)
         request.content_type = "application/json"
         request.body = PhusionPassenger::Utils::JSON.generate(:pid => @pid)
-        response = @instance.http_request("agents.s/server_api", request)
+        response = @instance.http_request("agents.s/core_api", request)
         if response.code.to_i / 100 == 2
           body = PhusionPassenger::Utils::JSON.parse(response.body)
           if body['detached']

data/lib/phusion_passenger/config/reopen_logs_command.rb

@@ -68,14 +68,14 @@ module PhusionPassenger
       end
 
       def perform_reopen_logs
-        perform_reopen_logs_on("watchdog", "watchdog")
+        perform_reopen_logs_on("watchdog", "watchdog_api")
         perform_reinherit_logs_on("core", "core_api")
         perform_reinherit_logs_on("UstRouter", "ust_router_api")
         puts "All done"
       end
 
       def perform_reopen_logs_on(name, socket_name)
-        puts "Reopening logs for #{AGENT_EXE} #{name}"
+        puts "Reopening logs for #{PROGRAM_NAME} #{name}"
         request = Net::HTTP::Post.new("/reopen_logs.json")
         try_performing_full_admin_basic_auth(request, @instance)
         request.content_type = "application/json"

data/lib/phusion_passenger/config/restart_app_command.rb

@@ -96,6 +96,11 @@ module PhusionPassenger
             "default is to exit with an error") do
             options[:ignore_app_not_running] = true
           end
+          opts.on("--ignore-passenger-not-running", "Exit successfully if #{PROGRAM_NAME}#{nl}" +
+            "is not currently running. The default is to#{nl}" +
+            "exit with an error") do
+            options[:ignore_passenger_not_running] = true
+          end
           opts.on("--instance NAME", String, "The #{PROGRAM_NAME} instance to select") do |value|
             options[:instance] = value
           end
@@ -220,7 +225,7 @@ module PhusionPassenger
           request.body = PhusionPassenger::Utils::JSON.generate(
             :name => group_name,
             :method => restart_method)
-          response = @instance.http_request("agents.s/server_api", request)
+          response = @instance.http_request("agents.s/core_api", request)
           if response.code.to_i / 100 == 2
             response.body
           elsif response.code.to_i == 401
@@ -246,7 +251,7 @@ module PhusionPassenger
       def query_pool_xml
         request = Net::HTTP::Get.new("/pool.xml")
         try_performing_ro_admin_basic_auth(request, @instance)
-        response = @instance.http_request("agents.s/server_api", request)
+        response = @instance.http_request("agents.s/core_api", request)
         if response.code.to_i / 100 == 2
           REXML::Document.new(response.body)
         elsif response.code.to_i == 401

data/lib/phusion_passenger/config/utils.rb

@@ -41,18 +41,32 @@ module PhusionPassenger
         if name = @options[:instance]
           @instance = AdminTools::InstanceRegistry.new.find_by_name_prefix(name)
           if !@instance
-            STDERR.puts "*** ERROR: there doesn't seem to be a #{PROGRAM_NAME} instance running with the name '#{name}'."
+            if @options[:ignore_passenger_not_running]
+              message_type = "WARNING"
+            else
+              message_type = "ERROR"
+            end
+            STDERR.puts "*** #{message_type}: there doesn't seem to be a #{PROGRAM_NAME} instance running with the name '#{name}'."
             list_all_passenger_instances(AdminTools::InstanceRegistry.new.list)
             STDERR.puts
             STDERR.puts "Please pass `--instance <NAME>` to select a specific #{PROGRAM_NAME} instance."
-            abort
+            if @options[:ignore_passenger_not_running]
+              exit
+            else
+              abort
+            end
           elsif @instance == :ambigious
             abort "*** ERROR: there are multiple instances whose name start with '#{name}'. Please specify the full name."
           end
         else
           instances = AdminTools::InstanceRegistry.new.list
           if instances.empty?
-            STDERR.puts "*** ERROR: #{PROGRAM_NAME} doesn't seem to be running. If you are sure that it"
+            if @options[:ignore_passenger_not_running]
+              message_type = "WARNING"
+            else
+              message_type = "ERROR"
+            end
+            STDERR.puts "*** #{message_type}: #{PROGRAM_NAME} doesn't seem to be running. If you are sure that it"
             STDERR.puts "is running, then the causes of this problem could be one of:"
             STDERR.puts
             STDERR.puts " 1. You customized the instance registry directory using Apache's"
@@ -66,7 +80,11 @@ module PhusionPassenger
             STDERR.puts "    PassengerInstanceRegistryDir option, Nginx's passenger_instance_registry_dir"
             STDERR.puts "    option, or #{PROGRAM_NAME} Standalone's --instance-registry-dir command"
             STDERR.puts "    line argument."
-            abort
+            if @options[:ignore_passenger_not_running]
+              exit
+            else
+              abort
+            end
           elsif instances.size == 1
             @instance = instances.first
           else
@@ -91,8 +109,12 @@ module PhusionPassenger
         puts
         printf "%-25s  %s\n", "Name", "Description"
         puts "------------------------------------------------------------------"
-        instances.each do |instance|
-          printf "%-25s  %s\n", instance.name, instance.server_software
+        if instances.empty?
+          printf "%-25s  %s\n", "(list empty)", "-"
+        else
+          instances.each do |instance|
+            printf "%-25s  %s\n", instance.name, instance.server_software
+          end
         end
       end
 

data/lib/phusion_passenger/constants.rb

@@ -87,9 +87,9 @@ module PhusionPassenger
     PASSENGER_API_VERSION_MAJOR = 0
     PASSENGER_API_VERSION_MINOR = 2
     PASSENGER_API_VERSION = "#{PASSENGER_API_VERSION_MAJOR}.#{PASSENGER_API_VERSION_MINOR}"
-    SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 2
-    SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 3
-    SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION = 3
+    SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION = 3
+    SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION = 0
+    SERVER_INSTANCE_DIR_STRUCTURE_MIN_SUPPORTED_MINOR_VERSION = 0
 
     # Misc
     FEEDBACK_FD = 3

data/resources/templates/standalone/config.erb

@@ -57,6 +57,8 @@ http {
     passenger_root '<%= PhusionPassenger.install_spec %>';
     passenger_abort_on_startup_error on;
     passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@working_dir}/temp_dir_toucher.pid") %>;
+    passenger_ctl integration_mode standalone;
+    passenger_ctl standalone_engine nginx;
     passenger_user_switching off;
     <%= nginx_option :passenger_log_level, :log_level %>
     <%= nginx_option :passenger_max_pool_size, :max_pool_size %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.11
+  version: 5.0.13
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJViQ+RAAoJECrHRaUKISqMZEoH/1ZOrd7Jy/XT5Nz9oGGDFGSJ
-j/0JK1zsoS3Osa8BWO90kaRBmFasijLXfjYSsTKa15BII8kjS2/kx/6qpSWoDijZ
-7bZ+FHKvGo0YRNGLntTZ2TldUH6LZwk+CPrSagUe9E8P9wdHzRSiNVGnVd/06uVp
-cmMQ7E6NA/ljqWcLSZ2/FJexF1ahkxwbTx6wf+OsD+UkO/SARNQSPj4G/iSeSJHm
-E2/JDNnS7xfFszyQlltjIcv8wS3XRzxm8lN8jQpyLYZvaOa86E2Hg4U/yoeXk5vh
-nfS+DnYCetzkLAmGgO2QVePxIUJw+JQkfvX28uov9udAZYElk8FCErD5favZE+M=
-=/+ym
+iQEcBAABAgAGBQJVlbSXAAoJECrHRaUKISqMi64H/iywK6Kt+04DltbH1fGq/7w1
+L3RonHItoOovzPQ7hE31/7STmbOQ2NcV2pMBIRG6Ble4Oywtk2bAPEIGkHCiUg+e
+Tq2hAOJwnRZQmO2AqV7Hm1R/Ec75gDwuRsqz7sCSkCm9kMR7LK+G4T4/SFfvlpNf
+pxh8aL5B06bvIM2LOE9lxYA6JgpS7aTRDe2WiAoU3vvVOc0QyWCm8aj0AKGn8kKc
+KRsZtYkQ64+kReRuFbu/WymDTYXDDVZ1xQiRjaU/2ZD2Xw8giA+/p2WXoSEuy9kk
+2WBtDeMoeVSKMx7mgm/4ZWubOH2KON/OPoDQ20oDD/N8nXQkVKUcrWSPxi5B76I=
+=ZTHP
 -----END PGP SIGNATURE-----