passenger 5.0.10 → 5.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTE3MDk3NTZhM2E0YmZjYjRlMGQ1MTU2NDZmNzBmZTlhNmE4NWI0OQ==
+    ZjFiNWQ0MmNkOTQ1MWMzNzNiNmY1NTE0ZDQ2YTM3YzJhNTA0ZDU2OQ==
   data.tar.gz: !binary |-
-    ZmU4MjYyZGJjOWI5ZTJjODUwYzM3MTc3YWVlNDA5MWY0MDllOTQyZQ==
+    OGRhYmI2NzNiOThlYWM2YWMwOWEyMWU1MDUyNTJkYWM0NmIzMzBjMg==
 SHA512:
   metadata.gz: !binary |-
-    NzdjNDJlMjQ3ZDJkZTg1N2YwMmExYTYxNDM3OWM1YTI0ZGE5MWRhZTBjYjM4
-    YTk4ZGE1OGUyZTVhYWMxZDVhN2YyMjBiZWI0ZDNkNDFiN2Y5M2Y0OTY1Njgx
-    ODNlZmQ4NzQwMzI2OTYwN2ZmYzAxMWJkZGQwN2Q1NjI5MDc5NDI=
+    ZGJmZjE1YTQzYTg1NTU5YmE2NTE2YjFhZGFhNmZjMzc0NzQ1MmFhOTZjOGVh
+    ZjQzMDIyNjcxNmIyZjdkNjQxZmMwNDgwNWI2MmQ3MDlkZGYzZmU2OTk3YzM0
+    ZmYyMjAzMTc4NDdlYzQxYzdhODBlY2NjMjYxNzQ1OWE2MDg1OTg=
   data.tar.gz: !binary |-
-    MmFkMmMxMzNmYzQ2YWQ5MDc5ZjE1ODU0YzVlMzRiNGEyOWE4ZWRmNTE5NTI4
-    YWQxYTgxMWIyNTJmZWJjM2FjYzA3ODY5Yzc0OTI2NTU0OGZiZjJkNjlmYjY2
-    NTI0ODU4MWQ5NDc1MDI3YWMzYTZkZjlhZDIyZDk4OTg2NTZlOGU=
+    NDcwOTRlZDkwYmExOTQyZWEwNDlhODhhNDQ4MzczYTQwYTA5MjYzNzA2ZjE1
+    NTYwZWQ5OWIyMWYyZjUxMjUxY2YwMTk4YzAyMDMzNDM1YTE5ZmIzOTIyZmRh
+    YzFlZDljMzE1MGFmMmI2MmU2MTE1NWZkZDQwMzMzNWIxNGI0MDc=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVeH8AAAoJECrHRaUKISqMiO4IAKoKQUyUaazkuMdhIcm92NQB
-NXuz0Cv+ckyoJIc6IRBNiXXaV+uys67pAYhQQVLcuVaTQ3BN5M4JylZQbad8soSY
-A70O2pL6vdIovVfiGFacesLphy6cSjAJ75EG5Vh2D/RcSRwVQvoeFvRjyU72pAsY
-ixXiM8DT+jw09FHphD4dFozh8adD3yuqKIUWCPE7qkPKD9G5Inu2QzIUpUJQQ7bh
-6G58J0ohn2AL18qRIVIFrrGjxc1M4fPgwQFDK+a/+NhEDeAQH5KgfQ6wqSS1Lz0i
-dG1+jqntPM8Be6FzzWYTB1L+uVd8IfE9UM1+REgvGJG8roGISWlC+3tWl5Mp14E=
-=68/m
+iQEcBAABAgAGBQJViQ+SAAoJECrHRaUKISqM604H/RrRMSPP09EbJhX94f6wNDDt
+jfNeVx773mN/GryyVv2i4cpos24uqLTwPi8JVWkNSRqD2+bmDUL7M5yXnS+J89zB
+/3F/TXRUAtB+2eH9NpzT6WPQx5A6vNXK1ovQSk/BmkVXIm3TXl9xtVgTWaT91tOP
+DvW7ZFVhwG41FGiR1+jU6lA6f8rc2ion32lqNAI6ZvFN0ro5+vjT7AqaR6JmDmn6
+vhan8iNa0J1B91FjN1n0eIQo/2yOJvoLBLuUe117uNtuoPCw4CMZXUL+Yo1OhdoC
+8JOQidQIJ11obEhvk06UjSnLssB0vFrDlNO1zdkRLrNp8mTmjhFsUZQDByMSyLk=
+=0i9C
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVeH7/AAoJECrHRaUKISqMQZ8H/RnWcjNuNcpgRko+KV6nLxof
-/meZflUvmMn6QvR2kE4f4zEsGrhwoP5w17f4+gvg19b8IfSOrqHOFrET8rc4UEUu
-TOytgbpyPD4BGSjjy4LCn5Ldv+AA/VE3817IZuozo+j6NuQ6qcKReeNt8K4DXDZ6
-aPSRwuY5zqWpK/g69e1byqxn5LrotoyLSmmbpCDObQxAXDHelnluRw1JiEFzojAj
-6ObZj/i7XbHnGKIa3QsvdEh1y63Lnc8T+7N1seukqceLmbQ+D85cWuE7BEbTJhBA
-/8+RF4t1v5tuRaXOPaQKDT/SD+Re3KO5kuuNc8a6q4TiLVGyJ3eApkilqFzCEsA=
-=LCRZ
+iQEcBAABAgAGBQJViQ+SAAoJECrHRaUKISqMrPsIAIotbspFEsXcIDrDK5Fzzdk8
+/LpiPwn3tsH9ieSasBJnwNmjFWrMp5slr8ta67EqSW+pnP7wmw2EsK7/J9kLDP8c
+UtLFCBm7eAju4CmprZhu2UtqrpwiOZgSLk0Ze8HuIPE4dnYxa9N69HSeOtSyW4lO
+J2TzUC1/QZJSmLG4WXPyBah6e6sFhZdoHGge78xCsoQR8fspAj1p7t6TBmESVAmA
+MW7A0ZPXlXRdw0N3OaTK9vnG+Y1UtMmN45PD4NjZHpntOB3wcWv+Sm8nYRWzFdAx
+hjKsZFLqQHkNXfcsVdCeStyzEcbmdE8fbUSBDPtjDVPlicD2AvHjG4rMOdgOZ1s=
+=UBLz
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,21 @@
+Release 5.0.11
+--------------
+
+ * In 5.0.10, admin tools such as `passenger-status` and `passenger-config restart-app` display an authorization error if they are run without sudo, while at the same time Passenger isn't serving any applications. Since this is confusing, they have now been modified to display a more appropriate error message.
+ * Fixes a bug in the RPMs that prevent admin tools such as `passenger-status` and `passenger-config restart-app` from working when they are invoked without root privileges.
+ * Fixes a bug on OS X that prevent admin tools such as `passenger-status` and `passenger-config restart-app` from detecting Passenger instance directories when they are invoked without root privileges. Closes GH-1535.
+ * Fixes a bug that causes Passenger not to work if the HOME environment variable is not set.
+ * Fixes compatibility with non-Rails Ruby apps that require the actionview gem. Closes GH-1547.
+ * Fixes some non-fatal "permission denied" error that may occasionally occur if user switching is turned off. Closes GH-1541.
+ * Relative values for the `pid_file` and `log_file` options in Passengerfile.json are now supported.
+ * If Passengerfile.json contains a syntax error, Passenger Standalone now correctly prints an error message instead of crashing.
+ * Sending a SIGABRT signal to a Ruby process now properly makes it terminate.
+ * The `passenger-config restart-app` command now accepts `.` as parameter, which it will interpreter as "restart the app in the current working directory". Closes GH-1386.
+ * [Apache] Setting `PassengerLogLevel` no longer redirects Apache's own stderr to that log file. Closes GH-1373.
+ * [Standalone] Passenger Standalone's Nginx engine now includes the RealIP module. Closes GH-1389.
+ * [Standalone] The `--max-preloader-idle-time` option has been added.
+
+
 Release 5.0.10
 --------------
 

data/CONTRIBUTING.md

@@ -178,9 +178,9 @@ The most important directories are:
    Source code shared by the Apache and Nginx modules.
  * `ext/common/agents` <br>
    Source code of the PassengerAgent executable. The agent can be started in multiple modes.
-   * The watchdog is is the main Phusion Passenger control process, starts the HTTP server and the logging agent, and restarts them when they crash. It also cleans everything up upon shut down.
-   * The HTTP server performs most of the heavy lifting. It parses requests, spawns application processes, forwards requests to the correct process and forwards application responses back to the web server.
-   * The logging agent processes Union Station data and sends them to the Union Station server.
+   * The watchdog is the main Phusion Passenger process. It starts the Passenger core and the UstRouter, and restarts them when they crash. It also cleans everything up upon shut down.
+   * The core performs most of the heavy lifting. It parses requests, spawns application processes, forwards requests to the correct process and forwards application responses back to the web server.
+   * The UstRouter processes Union Station data and sends them to the Union Station server.
  * `bin` <br>
    User executables.
  * `helper-scripts` <br>

data/bin/passenger-status

@@ -118,8 +118,12 @@ def show_status(instance, options)
     if response.code.to_i / 100 == 2
       puts response.body
     elsif response.code.to_i == 401
-      print_permission_error_message
-      exit 2
+      if response["pool-empty"] == "true"
+        puts "#{PROGRAM_NAME} is currently not serving any applications."
+      else
+        print_permission_error_message
+        exit 2
+      end
     else
       STDERR.puts "*** An error occured."
       STDERR.puts "#{response.code}: #{response.body}"
@@ -174,8 +178,12 @@ def show_status(instance, options)
         STDERR.puts "*** Tip: if you install the 'xmllint' command then the XML output will be indented."
       end
     elsif response.code.to_i == 401
-      print_permission_error_message
-      exit 2
+      if response["pool-empty"] == "true"
+        puts "#{PROGRAM_NAME} is currently not serving any applications."
+      else
+        print_permission_error_message
+        exit 2
+      end
     else
       STDERR.puts "*** An error occured."
       STDERR.puts "#{response.code}: #{response.body}"

data/build/agents.rb

@@ -23,16 +23,16 @@
 
 AGENT_OBJECTS = {
   'WatchdogMain.o' => [
-    'ext/common/agents/Watchdog/Main.cpp',
-    'ext/common/agents/Watchdog/Main.cpp',
-    'ext/common/agents/Watchdog/AgentWatcher.cpp',
-    'ext/common/agents/Watchdog/HelperAgentWatcher.cpp',
-    'ext/common/agents/Watchdog/LoggingAgentWatcher.cpp',
-    'ext/common/agents/Watchdog/InstanceDirToucher.cpp',
-    'ext/common/agents/Watchdog/ApiServer.h',
-    'ext/common/agents/ApiServerUtils.h',
-    'ext/common/agents/HelperAgent/OptionParser.h',
-    'ext/common/agents/LoggingAgent/OptionParser.h',
+    'ext/common/agent/Watchdog/Main.cpp',
+    'ext/common/agent/Watchdog/Main.cpp',
+    'ext/common/agent/Watchdog/AgentWatcher.cpp',
+    'ext/common/agent/Watchdog/CoreWatcher.cpp',
+    'ext/common/agent/Watchdog/UstRouterWatcher.cpp',
+    'ext/common/agent/Watchdog/InstanceDirToucher.cpp',
+    'ext/common/agent/Watchdog/ApiServer.h',
+    'ext/common/agent/ApiServerUtils.h',
+    'ext/common/agent/Core/OptionParser.h',
+    'ext/common/agent/UstRouter/OptionParser.h',
     'ext/common/ServerKit/Server.h',
     'ext/common/ServerKit/HttpServer.h',
     'ext/common/ServerKit/HttpHeaderParser.h',
@@ -42,23 +42,23 @@ AGENT_OBJECTS = {
     'ext/common/ResourceLocator.h',
     'ext/common/Utils/VariantMap.h'
   ],
-  'ServerMain.o' => [
-    'ext/common/agents/HelperAgent/Main.cpp',
-    'ext/common/agents/HelperAgent/OptionParser.h',
-    'ext/common/agents/HelperAgent/ApiServer.h',
-    'ext/common/agents/HelperAgent/ResponseCache.h',
-    'ext/common/agents/HelperAgent/RequestHandler.h',
-    'ext/common/agents/HelperAgent/RequestHandler/Client.h',
-    'ext/common/agents/HelperAgent/RequestHandler/AppResponse.h',
-    'ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h',
-    'ext/common/agents/HelperAgent/RequestHandler/Utils.cpp',
-    'ext/common/agents/HelperAgent/RequestHandler/Hooks.cpp',
-    'ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp',
-    'ext/common/agents/HelperAgent/RequestHandler/BufferBody.cpp',
-    'ext/common/agents/HelperAgent/RequestHandler/CheckoutSession.cpp',
-    'ext/common/agents/HelperAgent/RequestHandler/SendRequest.cpp',
-    'ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp',
-    'ext/common/agents/ApiServerUtils.h',
+  'CoreMain.o' => [
+    'ext/common/agent/Core/Main.cpp',
+    'ext/common/agent/Core/OptionParser.h',
+    'ext/common/agent/Core/ApiServer.h',
+    'ext/common/agent/Core/ResponseCache.h',
+    'ext/common/agent/Core/RequestHandler.h',
+    'ext/common/agent/Core/RequestHandler/Client.h',
+    'ext/common/agent/Core/RequestHandler/AppResponse.h',
+    'ext/common/agent/Core/RequestHandler/TurboCaching.h',
+    'ext/common/agent/Core/RequestHandler/Utils.cpp',
+    'ext/common/agent/Core/RequestHandler/Hooks.cpp',
+    'ext/common/agent/Core/RequestHandler/InitRequest.cpp',
+    'ext/common/agent/Core/RequestHandler/BufferBody.cpp',
+    'ext/common/agent/Core/RequestHandler/CheckoutSession.cpp',
+    'ext/common/agent/Core/RequestHandler/SendRequest.cpp',
+    'ext/common/agent/Core/RequestHandler/ForwardResponse.cpp',
+    'ext/common/agent/ApiServerUtils.h',
     'ext/common/ServerKit/Server.h',
     'ext/common/ServerKit/HttpServer.h',
     'ext/common/ServerKit/HttpHeaderParser.h',
@@ -84,15 +84,15 @@ AGENT_OBJECTS = {
     'ext/common/Utils/SystemMetricsCollector.h',
     'ext/common/Utils/VariantMap.h'
   ],
-  'LoggingMain.o' => [
-    'ext/common/agents/LoggingAgent/Main.cpp',
-    'ext/common/agents/LoggingAgent/OptionParser.h',
-    'ext/common/agents/LoggingAgent/ApiServer.h',
-    'ext/common/agents/LoggingAgent/LoggingServer.h',
-    'ext/common/agents/LoggingAgent/RemoteSender.h',
-    'ext/common/agents/LoggingAgent/DataStoreId.h',
-    'ext/common/agents/LoggingAgent/FilterSupport.h',
-    'ext/common/agents/ApiServerUtils.h',
+  'UstRouterMain.o' => [
+    'ext/common/agent/UstRouter/Main.cpp',
+    'ext/common/agent/UstRouter/OptionParser.h',
+    'ext/common/agent/UstRouter/ApiServer.h',
+    'ext/common/agent/UstRouter/LoggingServer.h',
+    'ext/common/agent/UstRouter/RemoteSender.h',
+    'ext/common/agent/UstRouter/DataStoreId.h',
+    'ext/common/agent/UstRouter/FilterSupport.h',
+    'ext/common/agent/ApiServerUtils.h',
     'ext/common/ServerKit/Server.h',
     'ext/common/ServerKit/HttpServer.h',
     'ext/common/ServerKit/HttpHeaderParser.h',
@@ -104,15 +104,15 @@ AGENT_OBJECTS = {
     'ext/common/Utils/VariantMap.h',
     'ext/common/Utils/BlockingQueue.h'
   ],
-  'SystemMetricsTool.o' => [
-    'ext/common/agents/HelperAgent/SystemMetricsTool.cpp',
+  'SystemMetricsMain.o' => [
+    'ext/common/agent/SystemMetrics/Main.cpp',
     'ext/common/Utils/SystemMetricsCollector.h'
   ],
-  'TempDirToucher.o' => [
-    'ext/common/agents/TempDirToucher/Main.cpp'
+  'TempDirToucherMain.o' => [
+    'ext/common/agent/TempDirToucher/Main.cpp'
   ],
-  'SpawnPreparer.o' => [
-    'ext/common/agents/SpawnPreparer/Main.cpp'
+  'SpawnPreparerMain.o' => [
+    'ext/common/agent/SpawnPreparer/Main.cpp'
   ]
 }
 
@@ -133,12 +133,12 @@ AGENT_OBJECTS.each_pair do |agent_object, agent_dependencies|
 end
 
 agent_libs = COMMON_LIBRARY.
-  only(:base, :logging_agent, :other).
+  only(:base, :ust_router, :other).
   exclude('AgentsStarter.o')
 agent_objects = AGENT_OBJECTS.keys.map { |x| "#{AGENT_OUTPUT_DIR}#{x}" }
 dependencies = agent_objects + [
   'ext/common/Constants.h',
-  'ext/common/agents/Main.cpp',
+  'ext/common/agent/Main.cpp',
   LIBBOOST_OXT,
   agent_libs.link_objects,
   LIBEV_TARGET,
@@ -147,7 +147,7 @@ dependencies = agent_objects + [
 file AGENT_OUTPUT_DIR + AGENT_EXE => dependencies do
   agent_objects_as_string = agent_objects.join(" ")
   sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
-  compile_cxx("ext/common/agents/Main.cpp",
+  compile_cxx("ext/common/agent/Main.cpp",
     "-o #{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o " <<
     "#{EXTRA_PRE_CXXFLAGS} " <<
     "-Iext -Iext/common " <<

data/build/apache2.rb

@@ -35,7 +35,7 @@ APACHE2_MODULE_INPUT_FILES = {
     ext/apache2/Configuration.cpp
     ext/apache2/Configuration.h
     ext/apache2/Configuration.hpp
-    ext/common/agents/LoggingAgent/FilterSupport.h),
+    ext/common/agent/UstRouter/FilterSupport.h),
   APACHE2_OUTPUT_DIR + 'Bucket.o' => %w(
     ext/apache2/Bucket.cpp
     ext/apache2/Bucket.h),

data/build/basics.rb

@@ -165,7 +165,7 @@ AGENT_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
 AGENT_LDFLAGS << " #{PlatformInfo.electric_fence_ldflags}" if USE_EFENCE
 AGENT_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 AGENT_LDFLAGS << " -lselinux" if USE_SELINUX
-# Extra linker flags for backtrace_symbols() to generate useful output (see AgentsBase.cpp).
+# Extra linker flags for backtrace_symbols() to generate useful output (see agent/Base.cpp).
 AGENT_LDFLAGS << " #{PlatformInfo.export_dynamic_flags}"
 # Enable dead symbol elimination on OS X.
 AGENT_LDFLAGS << " -Wl,-dead_strip" if PlatformInfo.os_name == "macosx"

data/build/cxx_tests.rb

@@ -160,16 +160,16 @@ TEST_CXX_OBJECTS = {
     ext/common/Utils/Dechunker.h),
   'test/cxx/ResponseCacheTest.o' => %w(
     test/cxx/ResponseCacheTest.cpp
-    ext/common/agents/HelperAgent/ResponseCache.h
-    ext/common/agents/HelperAgent/RequestHandler/Request.h
-    ext/common/agents/HelperAgent/RequestHandler/AppResponse.h
+    ext/common/agent/Core/ResponseCache.h
+    ext/common/agent/Core/RequestHandler/Request.h
+    ext/common/agent/Core/RequestHandler/AppResponse.h
     ext/common/ServerKit/HttpRequest.h),
   'test/cxx/UnionStationTest.o' => %w(
     test/cxx/UnionStationTest.cpp
-    ext/common/agents/LoggingAgent/LoggingServer.h
-    ext/common/agents/LoggingAgent/RemoteSender.h
-    ext/common/agents/LoggingAgent/DataStoreId.h
-    ext/common/agents/LoggingAgent/FilterSupport.h
+    ext/common/agent/UstRouter/LoggingServer.h
+    ext/common/agent/UstRouter/RemoteSender.h
+    ext/common/agent/UstRouter/DataStoreId.h
+    ext/common/agent/UstRouter/FilterSupport.h
     ext/common/UnionStation/Connection.h
     ext/common/UnionStation/Core.h
     ext/common/UnionStation/Transaction.h
@@ -190,10 +190,10 @@ TEST_CXX_OBJECTS = {
     ext/common/MessageServer.h),
   # 'test/cxx/RequestHandlerTest.o' => %w(
   #   test/cxx/RequestHandlerTest.cpp
-  #   ext/common/agents/HelperAgent/RequestHandler.h
-  #   ext/common/agents/HelperAgent/FileBackedPipe.h
-  #   ext/common/agents/HelperAgent/ScgiRequestParser.h
-  #   ext/common/agents/HelperAgent/AgentOptions.h
+  #   ext/common/agent/Core/RequestHandler.h
+  #   ext/common/agent/Core/FileBackedPipe.h
+  #   ext/common/agent/Core/ScgiRequestParser.h
+  #   ext/common/agent/Core/AgentOptions.h
   #   ext/common/UnionStation/Connection.h
   #   ext/common/UnionStation/Core.h
   #   ext/common/UnionStation/Transaction.h
@@ -221,7 +221,7 @@ TEST_CXX_OBJECTS = {
     ext/common/Utils/SystemTime.cpp),
   'test/cxx/FilterSupportTest.o' => %w(
     test/cxx/FilterSupportTest.cpp
-    ext/common/agents/LoggingAgent/FilterSupport.h),
+    ext/common/agent/UstRouter/FilterSupport.h),
   'test/cxx/CachedFileStatTest.o' => %w(
     test/cxx/CachedFileStatTest.cpp
     ext/common/Utils/CachedFileStat.hpp

data/doc/CloudLicensingConfiguration.html

@@ -178,16 +178,16 @@ passenger_ctl licensing_data_points_auto_send false;
 </code></pre>
 
 <p>Then restart Apache/Nginx. This configuration tells Phusion Passenger Enterprise not to automatically send usage data to the Phusion licensing server.</p></li>
-<li><p>Find out what user the PassengerHelperAgent process is running as.</p>
+<li><p>Find out what user the Passenger core process is running as.</p>
 
-<p>First, look for the PID of the PassengerHelperAgent process.</p>
+<p>First, look for the PID of the Passenger core process.</p>
 
 <pre><code>bash# passenger-memory-stats
 ...
 ------ Passenger processes ------
 PID    VMSize     Resident  Name
 ---------------------------------
-11243  2405.8 MB  2.7 MB    PassengerHelperAgent
+11243  2405.8 MB  2.7 MB    Passenger: core
 ...
 </code></pre>
 
@@ -202,7 +202,7 @@ PID    VMSize     Resident  Name
 <pre><code>bash# mkdir /var/lib/passenger-enterprise-usage
 </code></pre>
 
-<p>Ensure that it's owned by the user that PassengerHelperAgent runs as, and make it owner-accessible only:</p>
+<p>Ensure that it's owned by the user that the core runs as, and make it owner-accessible only:</p>
 
 <pre><code>bash# chown root: /var/lib/passenger-enterprise-usage
 bash# chmod 700 /var/lib/passenger-enterprise-usage
@@ -231,7 +231,7 @@ rm -f /var/lib/passenger-enterprise-usage/*.tar.gz
 
 <p>Here, <code>foo@reporter-machine-host-name</code> specifies which reporter machine you want to copy the package to, and which username you want to use to login to the reporter machine. Replace this with an appropriate value.</p>
 
-<p><strong>Notes about SSH keys</strong>: don't forget to setup SSH keys so that the script can scp to the reporter machine. The script will be run as the user that PassengerHelperAgent is running as.</p>
+<p><strong>Notes about SSH keys</strong>: don't forget to setup SSH keys so that the script can scp to the reporter machine. The script will be run as the user that the Passenger core is running as.</p>
 
 <p><strong>Notes about PATH</strong>: the above script assumes that the <code>passenger-config</code> command is in PATH. This is always the case if you installed Passenger Enterprise using Debian or RPM packages, but may not be the case if you installed it using RubyGems or tarball. If it's not in PATH, or when in doubt, you should specify the full path to passenger-config. You can find out where passenger-config is using <code>which</code>. For example:</p>
 
@@ -243,7 +243,7 @@ rm -f /var/lib/passenger-enterprise-usage/*.tar.gz
 
 <pre><code>/opt/passenger-enterprise-x.x.x/bin/passenger-config package-cloud-usage ...
 </code></pre></li>
-<li><p>Open the crontab of the user that PassengerHelperAgent is running as. For example, if PassengerHelperAgent is running as root:</p>
+<li><p>Open the crontab of the user that the Passenger core is running as. For example, if the core is running as root:</p>
 
 <pre><code>bash# sudo -u root -H crontab -e
 </code></pre></li>
@@ -251,7 +251,7 @@ rm -f /var/lib/passenger-enterprise-usage/*.tar.gz
 
 <pre><code>0 0 1 * * /var/lib/passenger-enterprise-usage/script
 </code></pre></li>
-<li><p>Ensure that <code>/var/lib/passenger-enterprise-usage/script</code> is run during system shutdown, as the user that PassengerHelperAgent is running as. On most Linux systems, this can be achieved by as follows:</p>
+<li><p>Ensure that <code>/var/lib/passenger-enterprise-usage/script</code> is run during system shutdown, as the user that the Passenger core is running as. On most Linux systems, this can be achieved by as follows:</p>
 
 <pre><code>bash# touch /etc/init.d/passenger-enterprise-cloud-license
 bash# chmod +x /etc/init.d/passenger-enterprise-cloud-license
@@ -260,14 +260,14 @@ bash# ln -s /etc/init.d/passenger-enterprise-cloud-license /etc/rc6.d/K00passeng
 bash# editor /etc/init.d/passenger-enterprise-cloud-license
 </code></pre>
 
-<p>If PassengerHelperAgent is running as root, then <code>/etc/init.d/passenger-enterprise-cloud-license</code> should contain:</p>
+<p>If the Passenger core is running as root, then <code>/etc/init.d/passenger-enterprise-cloud-license</code> should contain:</p>
 
 <pre><code>#!/bin/bash
 set -e
 exec /var/lib/passenger-enterprise-usage/script
 </code></pre>
 
-<p>If PassengerHelperAgent is not running as root, then it should contain:</p>
+<p>If the Passenger core is not running as root, then it should contain:</p>
 
 <pre><code>#!/bin/bash
 set -e
@@ -322,7 +322,7 @@ bash$ tar xzvf master.tar.gz &amp;&amp; rm master.tar.gz
 <p>Once the web servers and the reporter machine are all setup, you can test whether the setup works correctly.</p>
 
 <ol>
-<li><p>On each web server, run <code>/var/lib/passenger-enterprise-usage/script</code> as the user that PassengerHelperAgent runs as. For example, if PassengerHelperAgent is running as root:</p>
+<li><p>On each web server, run <code>/var/lib/passenger-enterprise-usage/script</code> as the user that the Passenger core runs as. For example, if the core is running as root:</p>
 
 <pre><code>sudo -u root -H /var/lib/passenger-enterprise-usage/script
 </code></pre>

data/doc/CloudLicensingConfiguration.txt.md

@@ -37,16 +37,16 @@ Follow these instructions on each server running Phusion Passenger Enterprise wi
 
     Then restart Apache/Nginx. This configuration tells Phusion Passenger Enterprise not to automatically send usage data to the Phusion licensing server.
 
- 3. Find out what user the PassengerHelperAgent process is running as.
+ 3. Find out what user the Passenger core process is running as.
 
-    First, look for the PID of the PassengerHelperAgent process.
+    First, look for the PID of the Passenger core process.
 
         bash# passenger-memory-stats
         ...
         ------ Passenger processes ------
         PID    VMSize     Resident  Name
         ---------------------------------
-        11243  2405.8 MB  2.7 MB    PassengerHelperAgent
+        11243  2405.8 MB  2.7 MB    Passenger: core
         ...
 
     Then use `ps` to determine what user it's running as. Usually, it's running as root.
@@ -59,7 +59,7 @@ Follow these instructions on each server running Phusion Passenger Enterprise wi
 
         bash# mkdir /var/lib/passenger-enterprise-usage
 
-    Ensure that it's owned by the user that PassengerHelperAgent runs as, and make it owner-accessible only:
+    Ensure that it's owned by the user that the core runs as, and make it owner-accessible only:
 
         bash# chown root: /var/lib/passenger-enterprise-usage
         bash# chmod 700 /var/lib/passenger-enterprise-usage
@@ -86,7 +86,7 @@ Follow these instructions on each server running Phusion Passenger Enterprise wi
 
     Here, `foo@reporter-machine-host-name` specifies which reporter machine you want to copy the package to, and which username you want to use to login to the reporter machine. Replace this with an appropriate value.
 
-    **Notes about SSH keys**: don't forget to setup SSH keys so that the script can scp to the reporter machine. The script will be run as the user that PassengerHelperAgent is running as.
+    **Notes about SSH keys**: don't forget to setup SSH keys so that the script can scp to the reporter machine. The script will be run as the user that the Passenger core is running as.
 
     **Notes about PATH**: the above script assumes that the `passenger-config` command is in PATH. This is always the case if you installed Passenger Enterprise using Debian or RPM packages, but may not be the case if you installed it using RubyGems or tarball. If it's not in PATH, or when in doubt, you should specify the full path to passenger-config. You can find out where passenger-config is using `which`. For example:
 
@@ -97,7 +97,7 @@ Follow these instructions on each server running Phusion Passenger Enterprise wi
 
         /opt/passenger-enterprise-x.x.x/bin/passenger-config package-cloud-usage ...
 
- 6. Open the crontab of the user that PassengerHelperAgent is running as. For example, if PassengerHelperAgent is running as root:
+ 6. Open the crontab of the user that the Passenger core is running as. For example, if the core is running as root:
 
         bash# sudo -u root -H crontab -e
 
@@ -105,7 +105,7 @@ Follow these instructions on each server running Phusion Passenger Enterprise wi
 
         0 0 1 * * /var/lib/passenger-enterprise-usage/script
 
- 8. Ensure that `/var/lib/passenger-enterprise-usage/script` is run during system shutdown, as the user that PassengerHelperAgent is running as. On most Linux systems, this can be achieved by as follows:
+ 8. Ensure that `/var/lib/passenger-enterprise-usage/script` is run during system shutdown, as the user that the Passenger core is running as. On most Linux systems, this can be achieved by as follows:
 
         bash# touch /etc/init.d/passenger-enterprise-cloud-license
         bash# chmod +x /etc/init.d/passenger-enterprise-cloud-license
@@ -113,13 +113,13 @@ Follow these instructions on each server running Phusion Passenger Enterprise wi
         bash# ln -s /etc/init.d/passenger-enterprise-cloud-license /etc/rc6.d/K00passenger-enterprise-cloud-license
         bash# editor /etc/init.d/passenger-enterprise-cloud-license
 
-    If PassengerHelperAgent is running as root, then `/etc/init.d/passenger-enterprise-cloud-license` should contain:
+    If the Passenger core is running as root, then `/etc/init.d/passenger-enterprise-cloud-license` should contain:
 
         #!/bin/bash
         set -e
         exec /var/lib/passenger-enterprise-usage/script
 
-    If PassengerHelperAgent is not running as root, then it should contain:
+    If the Passenger core is not running as root, then it should contain:
 
         #!/bin/bash
         set -e
@@ -166,7 +166,7 @@ In phase 1, you've setup web servers to scp usage data packages to the reporter
 
 Once the web servers and the reporter machine are all setup, you can test whether the setup works correctly.
 
- 1. On each web server, run `/var/lib/passenger-enterprise-usage/script` as the user that PassengerHelperAgent runs as. For example, if PassengerHelperAgent is running as root:
+ 1. On each web server, run `/var/lib/passenger-enterprise-usage/script` as the user that the Passenger core runs as. For example, if the core is running as root:
 
         sudo -u root -H /var/lib/passenger-enterprise-usage/script