passenger 4.0.53 → 4.0.55

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjExNzc1ZGFkYzExOGNhMDA5NmUyNzcxNmQwYzUwNDg5NjMwM2VlMA==
+    N2UzYzkxNTRiNjUxOTE2ODg4ZjE2NzcxNzU2ZGUyNTBjNmQ0OGUyZA==
   data.tar.gz: !binary |-
-    Y2MxMzRkOTM4NzY4YzJjYTVlNzJiNzI5MmI3MzFlZjVhZDRjMWU2Yw==
+    MDc2ZDYyNTIzN2Y0MGMyYWJiMDBjOTg1ZTc5NjI3ZmFhZTgzMDgxOQ==
 SHA512:
   metadata.gz: !binary |-
-    YTgyNTE1MjExOWQ0NTA1ZGI2Y2Q3OWEwMTkyY2UwZDkzZGU5MjM4ZjA2OGRk
-    OTU3NmU1NDM0ZmUwMDBlOTgzZTUzMDM0OWI4MTVkNDdjYzcxOWVlZGEwN2U0
-    OWRlODZhM2IzOWRkN2YxMzVhOWVlY2M2NDJjMWU0MGNlNmIwODg=
+    ZGU5ZThlOGMxZmExYmFlZGVlZjhlMWI5MTA4ZjkwMDMwNWRmNzhkZjc5YmVl
+    N2QzZjgxNDI2Nzc1NjY2ZmJlYjZkMjIxYjQzMDg0MWQ1YmIxOWJhYjMzODNj
+    ZGMyNWRlNTkxNWFkZTExZGU5MDhlMjNjMGMyYzc1MTQwODY1ZWM=
   data.tar.gz: !binary |-
-    OTMxYTJkN2YwN2I5NTM0MDU1YWUwNDU3MDQ3MDY0OTUyMTdkNGU5MzJhYTY4
-    NmE0NWNmNDcwODM5Yzg4NzRiNWQwNGZhZjVhN2Y4NjliOWQ2NGRjZjA3YjQ5
-    NWMzMWU4NmY3ZjJmOWZmYTYzMGY1MTY3Y2NiODJhZWNiMGQ5ZTI=
+    NzJhYWYwYjA3YTFiMjcwNDhiOGEwYjY2NWU4MTI2ZGY3NmMyMzg0YTBlOThl
+    ZDdhMjk1MDI3YzExYzc4NDNiMzJhYjEzNzllNjY2MGM2YWM3MzZjMjI2YmQ4
+    NjM0MzJkMDdmYzVkM2EzOTQzODFlNzIzZDRjNjgwOTgyOWYzMTM=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUK9ckAAoJECrHRaUKISqMwkUH/292jpZG5srKKCIySJcDRYz5
-Putx9SR98up1JzG5n/gNERdHMp+IHoK8mlwSYP0+oMN1KSX5uRsEKJbkxKR1BGYg
-aP2jVpJ1g8l8H73FCdA3SI50/q0xB+WnebuTcJdZ/NaJmI1m19YmFxD2NGbY84+W
-c0Z+r6ck2FmwsQEklwM1Sy9gh8ZcfXsey7ve3a4jVgc01J12cFIsOExEgnu4WM/F
-2+4ZodzFIjmF9wDB8AHlG9RK8JkXjNiCdxjxAqf/kb+MzebioB75BsX38TPACbje
-SLAElIgmyjKec33NDDtH6GiJxz51z0V0qha9OMXMtucvTD0rEj/DzbCGupOVUm0=
-=4g5+
+iQEcBAABAgAGBQJUiwJyAAoJECrHRaUKISqMAsAIALMntU8zBAVLqJm3qOAV1NkC
+PKc+2BaDSKQfLm81y5Yzsh0sCiq9aCqpITGh6fC6qUUup6o/1dOeZAQlTADm0XoS
+b2ndeWob5zN+06AVB7awyffOjrn4kW3IZkfWa4iR5uSwoAOo3m9uGjE8nK5QIb7v
+YzRm5uCKRa6LI2sbfblr1TrQU5ybVjbQV4ZIwz4CFnw3QgGbYIy6Mz+lVGaET9zv
+CXH7DJYiPSSWveWtKA4l3wWXKTQQniOxFYq7EWo7Uh9YX0ZoI0pUPXNepwb9CuSN
+HqKNR5tdJzXCR6EpQE/FtvsSEJFBuu6NaqcreFIJGBUr1YXVYRErA2H68tc4W3A=
+=E9js
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUK9ckAAoJECrHRaUKISqM4l0IAIxyvBpZ6hszbK0nKNQupO3Z
-/NkSYS79zUOJ9EMjHFNFxeVEG0IdYxLWyPNsqns1DUMg0t7aJdMV8sotoM+jsxuY
-mJ7DZNG+3nNbxeS3p80fzF7PbicyvcqTLOiWnX/r47EbkQCvLpTHk+NI8JKasW/Y
-3z6RQ7qwcds2UPw9kh/Yhm0m1INQl4tUFz+hfKfPIk3/pixfrnEZWVZSUF7B+CP2
-cTsTriX5kRUP2oXW3SFSoGAiY3xSilnGhG1JdzG05WLdaDyrRn6ibYxEuX2hrXXN
-FfDrv0ntvcZ1FRybJMGjejcRp8Z8/Xb2kvLL2Xyu32qDexfmqtr9FQkQU8dZjt8=
-=Galp
+iQEcBAABAgAGBQJUiwJyAAoJECrHRaUKISqMJiAH/0J2j3e4PfWQMqZUbBj64M7J
+uEJqycYmBPBhVe2SyRuJnflnZwiIGFpFfDY32XUqAXEJl+lJmZ7Yu+eqfdhHKVMG
+T0iEkBMSBCAOXkT9jEHwgph5uF4qh77TdO+YWS1lYKYUwsoK+rG2iLHieaFKyNzu
+c6UhLKiz4j7xbnHv0SU6uxBWq8tuihKxvMGksuaBe7paegXYCEo/v2zl3EXlliEc
+QVd97e2uxgxwCDc0zvlS8mznv+XVKRQz0fGs8oYYBe2Kv8Zi1S+QX3Cz6Btb0Ll6
+nd0fEvNI4j8QvhrhOVKaN4RkYlMpGSx1xYu6jUe4kQ6+AIvR6yN315coCEKa5UY=
+=keF3
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,16 @@
+Release 4.0.55
+--------------
+
+ * Supports Ruby 2.2. Closes GH-1314.
+ * Fixed Linux OS name detection.
+
+
+Release 4.0.54
+--------------
+
+ * Contains a licensing-related hot fix for Enterprise customers.
+
+
 Release 4.0.53
 --------------
 

data/build/common_library.rb

@@ -139,13 +139,15 @@ if USE_VENDORED_LIBEV
 
 	libev_sources = Dir["ext/libev/{*.c,*.h}"]
 	file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
-		sh "rm -f #{LIBEV_OUTPUT_DIR}/libev.la"
+		sh "rm -f #{LIBEV_OUTPUT_DIR}libev.la"
 		sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la"
 	end
 
 	task 'libev:clean' do
-		if File.exist?(LIBEV_OUTPUT_DIR + "Makefile")
-			sh "cd #{LIBEV_OUTPUT_DIR} && make maintainer-clean"
+		patterns = %w(Makefile config.h config.log config.status libtool
+			stamp-h1 *.o *.lo *.la .libs .deps)
+		patterns.each do |pattern|
+			sh "rm -rf #{LIBEV_OUTPUT_DIR}#{pattern}"
 		end
 	end
 
@@ -196,11 +198,15 @@ if USE_VENDORED_LIBEIO
 		sh "cd #{LIBEIO_OUTPUT_DIR} && make libeio.la"
 	end
 
-	task :clean do
-		if File.exist?(LIBEIO_OUTPUT_DIR + "Makefile")
-			sh "cd #{LIBEIO_OUTPUT_DIR} && make maintainer-clean"
+	task 'libeio:clean' do
+		patterns = %w(Makefile config.h config.log config.status libtool
+			stamp-h1 *.o *.lo *.la .libs .deps)
+		patterns.each do |pattern|
+			sh "rm -rf #{LIBEIO_OUTPUT_DIR}#{pattern}"
 		end
 	end
+
+	task :clean => 'libeio:clean'
 else
 	LIBEIO_CFLAGS = string_option('LIBEIO_CFLAGS', '-I/usr/include/libeio')
 	LIBEIO_LIBS   = string_option('LIBEIO_LIBS', '-leio')

data/build/documentation.rb

@@ -69,7 +69,7 @@ def create_markdown_compilation_task(target)
 			puts "Creating #{target}"
 			require 'erb'
 			template = ERB.new(File.read('doc/templates/markdown.html.erb'))
-			title    = File.basename(target, '.html')
+			title    = File.basename(target, '.html').gsub(/([A-Z])/, ' \1').strip
 			content  = File.read("#{target}.tmp")
 			css      = File.read('doc/templates/bootstrap.min.css')
 			data = template.result(binding)
@@ -91,6 +91,7 @@ def create_markdown_compilation_task(target)
 end
 
 create_markdown_compilation_task('doc/Packaging.html')
+create_markdown_compilation_task('doc/CloudLicensingConfiguration.html')
 
 desc "Upload documentation to the Phusion web server"
 task 'doc:rsync' => :doc do

data/debian.template/rules.template

@@ -7,6 +7,9 @@
 
 #if ['1', 'true', 'on', 'yes'].include?(ENV['USE_CCACHE'])
 	export USE_CCACHE=1
+	NGINX_CONFIGURE_OPTIONS = CC=/usr/lib/ccache/cc CXX=/usr/lib/ccache/c++
+#else
+	NGINX_CONFIGURE_OPTIONS =
 #endif
 
 # Speed up ccache (reduce I/O) by lightly compressing things.
@@ -34,7 +37,7 @@ override_dh_auto_build:
     	mv pkg/fakeroot pkg/fakeroot2.0
 #endif
 	cd nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %> && \
-		./configure --prefix=/tmp \
+		env $(NGINX_CONFIGURE_OPTIONS) ./configure --prefix=/tmp \
 		<%= PhusionPassenger::STANDALONE_NGINX_CONFIGURE_OPTIONS %> \
 		--add-module=`pwd`/../ext/nginx && \
 		make && \

data/dev/ci/run_jenkins.sh

@@ -11,12 +11,31 @@ if [[ "$WORKSPACE" = "" ]]; then
 	exit 1
 fi
 
-JENKINS_CACHE_DIR="$WORKSPACE/jenkins_cache"
+JENKINS_CACHE_DIR="$WORKSPACE/.jenkins_cache"
 mkdir -p "$JENKINS_CACHE_DIR"
 if [[ "$TEST_RPM_BUILDING" != 0 ]]; then
 	rm -rf "$JENKINS_CACHE_DIR/passenger_rpm/output"
 fi
 
+# run_travis.sh defaults COMPILE_CONCURRENCY to 2, but
+# Jenkins jobs are run on a single machine so we'll want
+# a COMPILE_CONCURRENCY of 1.
+COMPILE_CONCURRENCY=${COMPILE_CONCURRENCY:-1}
+
+# Relax permissions. Necessary for unit tests which test permissions.
+echo "Relaxing permissions"
+umask u=rwx,g=rx,o=rx
+(
+	set -x
+	chmod g+rx,o+rx .
+	find * -type f -print0 | xargs -0 -n 512 chmod g+r,o+r
+	find * -type d -print0 | xargs -0 -n 512 chmod g+rx,o+rx
+
+	# Create this file now because otherwise it would be owned by root,
+	# which Jenkins cannot remove.
+	touch test/test.log
+)
+
 function run_exec()
 {
 	echo "$ $@"
@@ -37,6 +56,7 @@ run_exec docker run --rm \
 	-e "APP_UID=`id -u`" \
 	-e "APP_GID=`id -g`" \
 	-e "SUDO=$SUDO" \
+	-e "COMPILE_CONCURRENCY=$COMPILE_CONCURRENCY" \
 	-e "TEST_CXX=$TEST_CXX" \
 	-e "TEST_RUBY=$TEST_RUBY" \
 	-e "TEST_NODE=$TEST_NODE" \

data/dev/ci/run_travis.sh

@@ -18,6 +18,7 @@ export VERBOSE=1
 export TRACE=1
 export DEVDEPS_DEFAULT=no
 export rvmsudo_secure_path=1
+export LC_CTYPE=C.UTF-8
 
 if [[ -e /etc/workaround-docker-2267/hosts ]]; then
 	HOSTS_FILE=/etc/workaround-docker-2267/hosts
@@ -111,10 +112,6 @@ function install_node_and_modules()
 	fi
 }
 
-if [[ "$MAGNUM" != "" ]]; then
-	run sudo sh -c "echo 127.0.0.1 magnum >> /etc/hosts"
-fi
-
 run uname -a
 run lsb_release -a
 run sudo tee /etc/dpkg/dpkg.cfg.d/02apt-speedup >/dev/null <<<"force-unsafe-io"
@@ -185,8 +182,14 @@ if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
 	apt_get_update
 	run sudo apt-get install -y --no-install-recommends \
 		devscripts debhelper rake apache2-mpm-worker apache2-threaded-dev \
-		ruby1.8 ruby1.8-dev ruby1.9.1 ruby1.9.1-dev rubygems libev-dev gdebi-core \
-		source-highlight
+		libev-dev gdebi-core source-highlight
+	if [[ `lsb_release -r -s` = 12.04 ]]; then
+		sudo apt-get install -y --no-install-recommends \
+			ruby1.8 ruby1.8-dev ruby1.9.1 ruby1.9.1-dev rubygems
+	else
+		sudo apt-get install -y --no-install-recommends \
+			ruby1.9.1 ruby1.9.1-dev ruby2.0 ruby2.0-dev
+	fi
 	install_test_deps_with_doctools
 	install_node_and_modules
 	run rake debian:dev debian:dev:reinstall

data/doc/CloudLicensingConfiguration.txt.md

@@ -0,0 +1,194 @@
+# Phusion Passenger Enterprise cloud licensing configuration
+
+When using the [Phusion Passenger Enterprise](https://www.phusionpassenger.com/enterprise) cloud license, you are billed per server per hour. There is a mechanism which automatically reports usage to the Phusion licensing server. This is implemented by sending a certain HTTPS request to the Phusion Passenger website, https://www.phusionpassenger.com, every 15 minutes, on every server that Phusion Passenger Enterprise is running with a cloud license.
+
+Sometimes, this manner of reporting usage data is not desirable, e.g. because of organizational security policies. For example, the servers that run Phusion Passenger Enterprise might block all outgoing traffic, or the network intrusion detection system might flag the usage reports as suspicious. To address these concerns, Phusion Passenger Enterprise 4.0.54 and later provide the ability to report usage through periodic batch jobs.
+
+## Conceptual overview
+
+The setup works as follows:
+
+ 1. Phusion Passenger Enterprise stores usage data on the local disk, but does not send them to the Phusion licensing server.
+ 2. On each server that runs Phusion Passenger Enterprise, a batch job A generates a package from the usage data that's stored on disk.
+ 3. All these packages are copied to another machine (let's call this "Reporter"), e.g. through SCP, USB stick, etc. The reporter machine may be any machine that you choose, as long as it can access the Phusion licensing server. The method of copying does not matter.
+ 4. On the reporter machine, a batch job B uploads all these packages to the Phusion licensing server.
+
+![Conceptual overview](images/cloud_licensing_batch_job.png)
+
+## Phase 1: setting up web servers
+
+Follow these instructions on each server running Phusion Passenger Enterprise with a cloud license.
+
+ 1. Login to the web server and open a superuser shell. For example:
+
+        bash$ sudo -H bash
+
+    Or, if you're an RVM user, use rvmsudo instead of sudo:
+
+        bash$ rvmsudo -H bash
+
+ 2. Add the following configuration to your Apache or Nginx configuration file:
+
+        # Apache
+        PassengerCtl licensing_data_points_auto_send false
+
+        # Nginx
+        passenger_ctl licensing_data_points_auto_send false;
+
+    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.
+
+    First, look for the PID of the PassengerHelperAgent process.
+
+        bash# passenger-memory-stats
+        ...
+        ------ Passenger processes ------
+        PID    VMSize     Resident  Name
+        ---------------------------------
+        11243  2405.8 MB  2.7 MB    PassengerHelperAgent
+        ...
+
+    Then use `ps` to determine what user it's running as. Usually, it's running as root.
+
+        bash# ps -o pid,user -p 11243
+          PID USER
+        11245 root
+
+ 4. Create a directory in which to store usage data packages. For example:
+
+        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:
+
+        bash# chown root: /var/lib/passenger-enterprise-usage
+        bash# chmod 700 /var/lib/passenger-enterprise-usage
+
+ 5. Create a script inside the previous directory for generating a usage data package, and for copying packages to the reporter machine. This script is part of batch job A.
+
+        bash# touch /var/lib/passenger-enterprise-usage/script
+        bash# chmod +x /var/lib/passenger-enterprise-usage/script
+        bash# editor /var/lib/passenger-enterprise-usage/script
+
+    The script should contain:
+
+        #!/bin/bash
+        set -e
+
+        REPORTER_MACHINE=foo@reporter-machine-host-name
+        HOSTNAME=`hostname`
+        DATE=`date +%s`
+
+        set -x
+        passenger-config package-cloud-usage /var/lib/passenger-enterprise-usage/$HOSTNAME-$DATE.tar.gz
+        scp /var/lib/passenger-enterprise-usage/*.tar.gz $REPORTER_MACHINE:passenger-enterprise-usage/
+        rm -f /var/lib/passenger-enterprise-usage/*.tar.gz
+
+    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 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:
+
+        bash# which passenger-config
+        /opt/passenger-enterprise-x.x.x/bin/passenger-config
+
+    Then the script should call:
+
+        /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:
+
+        bash# sudo -u root -H crontab -e
+
+ 7. Insert the following entry into the crontab, so that the script is invoked on the 1st of every month:
+
+        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:
+
+        bash# touch /etc/init.d/passenger-enterprise-cloud-license
+        bash# chmod +x /etc/init.d/passenger-enterprise-cloud-license
+        bash# ln -s /etc/init.d/passenger-enterprise-cloud-license /etc/rc0.d/K00passenger-enterprise-cloud-license
+        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:
+
+        #!/bin/bash
+        set -e
+        exec /var/lib/passenger-enterprise-usage/script
+
+    If PassengerHelperAgent is not running as root, then it should contain:
+
+        #!/bin/bash
+        set -e
+        exec sudo -u PROPER_USERNAME_HERE -H /var/lib/passenger-enterprise-usage/script
+
+    Or, if you're an RVM user, use rvmsudo instead of sudo:
+
+        #!/bin/bash
+        set -e
+        exec rvmsudo -u PROPER_USERNAME_HERE -H /var/lib/passenger-enterprise-usage/script
+
+    **Note:** If your operating system does not respect /etc/rcX.d, please consult your operating system's manual to learn how to run `/var/lib/passenger-enterprise-usage/script` during system shutdown.
+
+## Phase 2: setting up the "reporter" machine
+
+In phase 1, you've setup web servers to scp usage data packages to the reporter machine, by logging into the reporter machine as a certain user. Let's call that user "foo".
+
+ 1. Login to the reporter machine as user foo.
+
+ 2. Create a directory that the web servers can scp into:
+
+        bash$ mkdir ~/passenger-enterprise-usage
+        bash$ chmod 700 ~/passenger-enterprise-usage
+
+ 3. Install the [passenger-enterprise-bulk-send-cloud-usage](https://github.com/phusion/passenger-enterprise-bulk-send-cloud-usage) tool:
+
+        bash$ cd ~
+        bash$ curl -L -O https://github.com/phusion/passenger-enterprise-bulk-send-cloud-usage/archive/master.tar.gz
+        bash$ tar xzvf master.tar.gz && rm master.tar.gz
+
+ 4. Open the crontab of user foo:
+
+        bash$ crontab -e
+
+ 5. Insert the following entry into the crontab to upload usage data packages on the 1st of every month:
+
+        0 1 1 * * ~/passenger-enterprise-bulk-send-cloud-usage/passenger-enterprise-bulk-send-cloud-usage --delete ~/passenger-enterprise-usage-*.tar.gz
+
+    This crontab entry is batch job B as described in the conceptual overview.
+
+    Note that this command is run at 1 AM: 1 hour after the web servers have generated usage data packages and copied them over to the reporter machine. You *must* therefore ensure that the clocks on the web servers and the reporter machine are properly synchronized, and that they are set to the same time zone.
+
+## Phase 3: testing
+
+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:
+
+        sudo -u root -H /var/lib/passenger-enterprise-usage/script
+
+    Or, if you're an RVM user, use rvmsudo instead of sudo:
+
+        rvmsudo -u root -H /var/lib/passenger-enterprise-usage/script
+
+    You should see output like this:
+
+        + passenger-config package-cloud-usage /var/lib/passenger-enterprise-usage/myhostname-1415377926.tar.gz
+        + scp /var/lib/passenger-enterprise-usage/myhostname-1415377310.tar.gz hongli@localhost:passenger-enterprise-usage/
+        myhostname-1415377310.tar.gz                     100%  605     0.6KB/s   00:00
+        + rm -f /var/lib/passenger-enterprise-usage/myhostname-1415377310.tar.gz
+
+ 2. Login to the reporter machine as the "foo" user (as described in phase 2) and run:
+
+        ~/passenger-enterprise-bulk-send-cloud-usage-master/passenger-enterprise-bulk-send-cloud-usage --delete ~/passenger-enterprise-usage/*.tar.gz
+
+    You should see output like this:
+
+        ---- Uploading ~/passenger-enterprise-usage/myhostname-1415377310.tar.gz -----
+        Success!
+        Deleting ~/passenger-enterprise-usage/myhostname-1415377310.tar.gz
+
+ 3. Login to the [Phusion Passenger Enterprise Customer Area](https://www.phusionpassenger.com/orders). Under "Cloud subscription status", click "View usage details". Verify that usage has been properly registered.

data/doc/Users guide Apache.txt

@@ -1883,7 +1883,7 @@ Apache's version also buffers to memory only, making it problematic for large re
 
 How does response buffering - whether it's done by Apache or by Phusion Passenger - exactly protect against slow clients?
 Consider an HTTP client that's on a dial-up modem link, and your
-application process generates a 2 MB response. If the response is buffered
+application process generates a 2 MB response. If the response is not buffered
 then your application process will be blocked until the entire 2 MB has been
 sent out to the HTTP client. This disallows your application process to do any useful
 work in the mean time. By buffering responses, Phusion Passenger or Apache will read

data/doc/templates/bootstrap.config.json

@@ -0,0 +1,388 @@
+{
+  "vars": {
+    "@gray-base": "#000",
+    "@gray-darker": "lighten(@gray-base, 13.5%)",
+    "@gray-dark": "lighten(@gray-base, 20%)",
+    "@gray": "lighten(@gray-base, 33.5%)",
+    "@gray-light": "lighten(@gray-base, 46.7%)",
+    "@gray-lighter": "lighten(@gray-base, 93.5%)",
+    "@brand-primary": "#428bca",
+    "@brand-success": "#5cb85c",
+    "@brand-info": "#5bc0de",
+    "@brand-warning": "#f0ad4e",
+    "@brand-danger": "#d9534f",
+    "@body-bg": "#fff",
+    "@text-color": "@gray-dark",
+    "@link-color": "@brand-primary",
+    "@link-hover-color": "darken(@link-color, 15%)",
+    "@link-hover-decoration": "underline",
+    "@font-family-sans-serif": "\"Helvetica Neue\", Helvetica, Arial, sans-serif",
+    "@font-family-serif": "Georgia, \"Times New Roman\", Times, serif",
+    "@font-family-monospace": "Menlo, Monaco, Consolas, \"Courier New\", monospace",
+    "@font-family-base": "@font-family-sans-serif",
+    "@font-size-base": "14px",
+    "@font-size-large": "ceil((@font-size-base * 1.25))",
+    "@font-size-small": "ceil((@font-size-base * 0.85))",
+    "@font-size-h1": "floor((@font-size-base * 2.6))",
+    "@font-size-h2": "floor((@font-size-base * 2.15))",
+    "@font-size-h3": "ceil((@font-size-base * 1.7))",
+    "@font-size-h4": "ceil((@font-size-base * 1.25))",
+    "@font-size-h5": "@font-size-base",
+    "@font-size-h6": "ceil((@font-size-base * 0.85))",
+    "@line-height-base": "1.428571429",
+    "@line-height-computed": "floor((@font-size-base * @line-height-base))",
+    "@headings-font-family": "inherit",
+    "@headings-font-weight": "500",
+    "@headings-line-height": "1.1",
+    "@headings-color": "inherit",
+    "@icon-font-path": "\"../fonts/\"",
+    "@icon-font-name": "\"glyphicons-halflings-regular\"",
+    "@icon-font-svg-id": "\"glyphicons_halflingsregular\"",
+    "@padding-base-vertical": "6px",
+    "@padding-base-horizontal": "12px",
+    "@padding-large-vertical": "10px",
+    "@padding-large-horizontal": "16px",
+    "@padding-small-vertical": "5px",
+    "@padding-small-horizontal": "10px",
+    "@padding-xs-vertical": "1px",
+    "@padding-xs-horizontal": "5px",
+    "@line-height-large": "1.33",
+    "@line-height-small": "1.5",
+    "@border-radius-base": "4px",
+    "@border-radius-large": "6px",
+    "@border-radius-small": "3px",
+    "@component-active-color": "#fff",
+    "@component-active-bg": "@brand-primary",
+    "@caret-width-base": "4px",
+    "@caret-width-large": "5px",
+    "@table-cell-padding": "8px",
+    "@table-condensed-cell-padding": "5px",
+    "@table-bg": "transparent",
+    "@table-bg-accent": "#f9f9f9",
+    "@table-bg-hover": "#f5f5f5",
+    "@table-bg-active": "@table-bg-hover",
+    "@table-border-color": "#ddd",
+    "@btn-font-weight": "normal",
+    "@btn-default-color": "#333",
+    "@btn-default-bg": "#fff",
+    "@btn-default-border": "#ccc",
+    "@btn-primary-color": "#fff",
+    "@btn-primary-bg": "@brand-primary",
+    "@btn-primary-border": "darken(@btn-primary-bg, 5%)",
+    "@btn-success-color": "#fff",
+    "@btn-success-bg": "@brand-success",
+    "@btn-success-border": "darken(@btn-success-bg, 5%)",
+    "@btn-info-color": "#fff",
+    "@btn-info-bg": "@brand-info",
+    "@btn-info-border": "darken(@btn-info-bg, 5%)",
+    "@btn-warning-color": "#fff",
+    "@btn-warning-bg": "@brand-warning",
+    "@btn-warning-border": "darken(@btn-warning-bg, 5%)",
+    "@btn-danger-color": "#fff",
+    "@btn-danger-bg": "@brand-danger",
+    "@btn-danger-border": "darken(@btn-danger-bg, 5%)",
+    "@btn-link-disabled-color": "@gray-light",
+    "@input-bg": "#fff",
+    "@input-bg-disabled": "@gray-lighter",
+    "@input-color": "@gray",
+    "@input-border": "#ccc",
+    "@input-border-radius": "@border-radius-base",
+    "@input-border-radius-large": "@border-radius-large",
+    "@input-border-radius-small": "@border-radius-small",
+    "@input-border-focus": "#66afe9",
+    "@input-color-placeholder": "#999",
+    "@input-height-base": "(@line-height-computed + (@padding-base-vertical * 2) + 2)",
+    "@input-height-large": "(ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2)",
+    "@input-height-small": "(floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2)",
+    "@legend-color": "@gray-dark",
+    "@legend-border-color": "#e5e5e5",
+    "@input-group-addon-bg": "@gray-lighter",
+    "@input-group-addon-border-color": "@input-border",
+    "@cursor-disabled": "not-allowed",
+    "@dropdown-bg": "#fff",
+    "@dropdown-border": "rgba(0,0,0,.15)",
+    "@dropdown-fallback-border": "#ccc",
+    "@dropdown-divider-bg": "#e5e5e5",
+    "@dropdown-link-color": "@gray-dark",
+    "@dropdown-link-hover-color": "darken(@gray-dark, 5%)",
+    "@dropdown-link-hover-bg": "#f5f5f5",
+    "@dropdown-link-active-color": "@component-active-color",
+    "@dropdown-link-active-bg": "@component-active-bg",
+    "@dropdown-link-disabled-color": "@gray-light",
+    "@dropdown-header-color": "@gray-light",
+    "@dropdown-caret-color": "#000",
+    "@screen-xs": "480px",
+    "@screen-xs-min": "@screen-xs",
+    "@screen-phone": "@screen-xs-min",
+    "@screen-sm": "768px",
+    "@screen-sm-min": "@screen-sm",
+    "@screen-tablet": "@screen-sm-min",
+    "@screen-md": "992px",
+    "@screen-md-min": "@screen-md",
+    "@screen-desktop": "@screen-md-min",
+    "@screen-lg": "1200px",
+    "@screen-lg-min": "@screen-lg",
+    "@screen-lg-desktop": "@screen-lg-min",
+    "@screen-xs-max": "(@screen-sm-min - 1)",
+    "@screen-sm-max": "(@screen-md-min - 1)",
+    "@screen-md-max": "(@screen-lg-min - 1)",
+    "@grid-columns": "12",
+    "@grid-gutter-width": "30px",
+    "@grid-float-breakpoint": "@screen-sm-min",
+    "@grid-float-breakpoint-max": "(@grid-float-breakpoint - 1)",
+    "@container-tablet": "(720px + @grid-gutter-width)",
+    "@container-sm": "@container-tablet",
+    "@container-desktop": "(940px + @grid-gutter-width)",
+    "@container-md": "@container-desktop",
+    "@container-large-desktop": "(1140px + @grid-gutter-width)",
+    "@container-lg": "@container-large-desktop",
+    "@navbar-height": "50px",
+    "@navbar-margin-bottom": "@line-height-computed",
+    "@navbar-border-radius": "@border-radius-base",
+    "@navbar-padding-horizontal": "floor((@grid-gutter-width / 2))",
+    "@navbar-padding-vertical": "((@navbar-height - @line-height-computed) / 2)",
+    "@navbar-collapse-max-height": "340px",
+    "@navbar-default-color": "#777",
+    "@navbar-default-bg": "#f8f8f8",
+    "@navbar-default-border": "darken(@navbar-default-bg, 6.5%)",
+    "@navbar-default-link-color": "#777",
+    "@navbar-default-link-hover-color": "#333",
+    "@navbar-default-link-hover-bg": "transparent",
+    "@navbar-default-link-active-color": "#555",
+    "@navbar-default-link-active-bg": "darken(@navbar-default-bg, 6.5%)",
+    "@navbar-default-link-disabled-color": "#ccc",
+    "@navbar-default-link-disabled-bg": "transparent",
+    "@navbar-default-brand-color": "@navbar-default-link-color",
+    "@navbar-default-brand-hover-color": "darken(@navbar-default-brand-color, 10%)",
+    "@navbar-default-brand-hover-bg": "transparent",
+    "@navbar-default-toggle-hover-bg": "#ddd",
+    "@navbar-default-toggle-icon-bar-bg": "#888",
+    "@navbar-default-toggle-border-color": "#ddd",
+    "@navbar-inverse-color": "lighten(@gray-light, 15%)",
+    "@navbar-inverse-bg": "#222",
+    "@navbar-inverse-border": "darken(@navbar-inverse-bg, 10%)",
+    "@navbar-inverse-link-color": "lighten(@gray-light, 15%)",
+    "@navbar-inverse-link-hover-color": "#fff",
+    "@navbar-inverse-link-hover-bg": "transparent",
+    "@navbar-inverse-link-active-color": "@navbar-inverse-link-hover-color",
+    "@navbar-inverse-link-active-bg": "darken(@navbar-inverse-bg, 10%)",
+    "@navbar-inverse-link-disabled-color": "#444",
+    "@navbar-inverse-link-disabled-bg": "transparent",
+    "@navbar-inverse-brand-color": "@navbar-inverse-link-color",
+    "@navbar-inverse-brand-hover-color": "#fff",
+    "@navbar-inverse-brand-hover-bg": "transparent",
+    "@navbar-inverse-toggle-hover-bg": "#333",
+    "@navbar-inverse-toggle-icon-bar-bg": "#fff",
+    "@navbar-inverse-toggle-border-color": "#333",
+    "@nav-link-padding": "10px 15px",
+    "@nav-link-hover-bg": "@gray-lighter",
+    "@nav-disabled-link-color": "@gray-light",
+    "@nav-disabled-link-hover-color": "@gray-light",
+    "@nav-tabs-border-color": "#ddd",
+    "@nav-tabs-link-hover-border-color": "@gray-lighter",
+    "@nav-tabs-active-link-hover-bg": "@body-bg",
+    "@nav-tabs-active-link-hover-color": "@gray",
+    "@nav-tabs-active-link-hover-border-color": "#ddd",
+    "@nav-tabs-justified-link-border-color": "#ddd",
+    "@nav-tabs-justified-active-link-border-color": "@body-bg",
+    "@nav-pills-border-radius": "@border-radius-base",
+    "@nav-pills-active-link-hover-bg": "@component-active-bg",
+    "@nav-pills-active-link-hover-color": "@component-active-color",
+    "@pagination-color": "@link-color",
+    "@pagination-bg": "#fff",
+    "@pagination-border": "#ddd",
+    "@pagination-hover-color": "@link-hover-color",
+    "@pagination-hover-bg": "@gray-lighter",
+    "@pagination-hover-border": "#ddd",
+    "@pagination-active-color": "#fff",
+    "@pagination-active-bg": "@brand-primary",
+    "@pagination-active-border": "@brand-primary",
+    "@pagination-disabled-color": "@gray-light",
+    "@pagination-disabled-bg": "#fff",
+    "@pagination-disabled-border": "#ddd",
+    "@pager-bg": "@pagination-bg",
+    "@pager-border": "@pagination-border",
+    "@pager-border-radius": "15px",
+    "@pager-hover-bg": "@pagination-hover-bg",
+    "@pager-active-bg": "@pagination-active-bg",
+    "@pager-active-color": "@pagination-active-color",
+    "@pager-disabled-color": "@pagination-disabled-color",
+    "@jumbotron-padding": "30px",
+    "@jumbotron-color": "inherit",
+    "@jumbotron-bg": "@gray-lighter",
+    "@jumbotron-heading-color": "inherit",
+    "@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
+    "@state-success-text": "#3c763d",
+    "@state-success-bg": "#dff0d8",
+    "@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
+    "@state-info-text": "#31708f",
+    "@state-info-bg": "#d9edf7",
+    "@state-info-border": "darken(spin(@state-info-bg, -10), 7%)",
+    "@state-warning-text": "#8a6d3b",
+    "@state-warning-bg": "#fcf8e3",
+    "@state-warning-border": "darken(spin(@state-warning-bg, -10), 5%)",
+    "@state-danger-text": "#a94442",
+    "@state-danger-bg": "#f2dede",
+    "@state-danger-border": "darken(spin(@state-danger-bg, -10), 5%)",
+    "@tooltip-max-width": "200px",
+    "@tooltip-color": "#fff",
+    "@tooltip-bg": "#000",
+    "@tooltip-opacity": ".9",
+    "@tooltip-arrow-width": "5px",
+    "@tooltip-arrow-color": "@tooltip-bg",
+    "@popover-bg": "#fff",
+    "@popover-max-width": "276px",
+    "@popover-border-color": "rgba(0,0,0,.2)",
+    "@popover-fallback-border-color": "#ccc",
+    "@popover-title-bg": "darken(@popover-bg, 3%)",
+    "@popover-arrow-width": "10px",
+    "@popover-arrow-color": "@popover-bg",
+    "@popover-arrow-outer-width": "(@popover-arrow-width + 1)",
+    "@popover-arrow-outer-color": "fadein(@popover-border-color, 5%)",
+    "@popover-arrow-outer-fallback-color": "darken(@popover-fallback-border-color, 20%)",
+    "@label-default-bg": "@gray-light",
+    "@label-primary-bg": "@brand-primary",
+    "@label-success-bg": "@brand-success",
+    "@label-info-bg": "@brand-info",
+    "@label-warning-bg": "@brand-warning",
+    "@label-danger-bg": "@brand-danger",
+    "@label-color": "#fff",
+    "@label-link-hover-color": "#fff",
+    "@modal-inner-padding": "15px",
+    "@modal-title-padding": "15px",
+    "@modal-title-line-height": "@line-height-base",
+    "@modal-content-bg": "#fff",
+    "@modal-content-border-color": "rgba(0,0,0,.2)",
+    "@modal-content-fallback-border-color": "#999",
+    "@modal-backdrop-bg": "#000",
+    "@modal-backdrop-opacity": ".5",
+    "@modal-header-border-color": "#e5e5e5",
+    "@modal-footer-border-color": "@modal-header-border-color",
+    "@modal-lg": "900px",
+    "@modal-md": "600px",
+    "@modal-sm": "300px",
+    "@alert-padding": "15px",
+    "@alert-border-radius": "@border-radius-base",
+    "@alert-link-font-weight": "bold",
+    "@alert-success-bg": "@state-success-bg",
+    "@alert-success-text": "@state-success-text",
+    "@alert-success-border": "@state-success-border",
+    "@alert-info-bg": "@state-info-bg",
+    "@alert-info-text": "@state-info-text",
+    "@alert-info-border": "@state-info-border",
+    "@alert-warning-bg": "@state-warning-bg",
+    "@alert-warning-text": "@state-warning-text",
+    "@alert-warning-border": "@state-warning-border",
+    "@alert-danger-bg": "@state-danger-bg",
+    "@alert-danger-text": "@state-danger-text",
+    "@alert-danger-border": "@state-danger-border",
+    "@progress-bg": "#f5f5f5",
+    "@progress-bar-color": "#fff",
+    "@progress-border-radius": "@border-radius-base",
+    "@progress-bar-bg": "@brand-primary",
+    "@progress-bar-success-bg": "@brand-success",
+    "@progress-bar-warning-bg": "@brand-warning",
+    "@progress-bar-danger-bg": "@brand-danger",
+    "@progress-bar-info-bg": "@brand-info",
+    "@list-group-bg": "#fff",
+    "@list-group-border": "#ddd",
+    "@list-group-border-radius": "@border-radius-base",
+    "@list-group-hover-bg": "#f5f5f5",
+    "@list-group-active-color": "@component-active-color",
+    "@list-group-active-bg": "@component-active-bg",
+    "@list-group-active-border": "@list-group-active-bg",
+    "@list-group-active-text-color": "lighten(@list-group-active-bg, 40%)",
+    "@list-group-disabled-color": "@gray-light",
+    "@list-group-disabled-bg": "@gray-lighter",
+    "@list-group-disabled-text-color": "@list-group-disabled-color",
+    "@list-group-link-color": "#555",
+    "@list-group-link-hover-color": "@list-group-link-color",
+    "@list-group-link-heading-color": "#333",
+    "@panel-bg": "#fff",
+    "@panel-body-padding": "15px",
+    "@panel-heading-padding": "10px 15px",
+    "@panel-footer-padding": "@panel-heading-padding",
+    "@panel-border-radius": "@border-radius-base",
+    "@panel-inner-border": "#ddd",
+    "@panel-footer-bg": "#f5f5f5",
+    "@panel-default-text": "@gray-dark",
+    "@panel-default-border": "#ddd",
+    "@panel-default-heading-bg": "#f5f5f5",
+    "@panel-primary-text": "#fff",
+    "@panel-primary-border": "@brand-primary",
+    "@panel-primary-heading-bg": "@brand-primary",
+    "@panel-success-text": "@state-success-text",
+    "@panel-success-border": "@state-success-border",
+    "@panel-success-heading-bg": "@state-success-bg",
+    "@panel-info-text": "@state-info-text",
+    "@panel-info-border": "@state-info-border",
+    "@panel-info-heading-bg": "@state-info-bg",
+    "@panel-warning-text": "@state-warning-text",
+    "@panel-warning-border": "@state-warning-border",
+    "@panel-warning-heading-bg": "@state-warning-bg",
+    "@panel-danger-text": "@state-danger-text",
+    "@panel-danger-border": "@state-danger-border",
+    "@panel-danger-heading-bg": "@state-danger-bg",
+    "@thumbnail-padding": "4px",
+    "@thumbnail-bg": "@body-bg",
+    "@thumbnail-border": "#ddd",
+    "@thumbnail-border-radius": "@border-radius-base",
+    "@thumbnail-caption-color": "@text-color",
+    "@thumbnail-caption-padding": "9px",
+    "@well-bg": "#f5f5f5",
+    "@well-border": "darken(@well-bg, 7%)",
+    "@badge-color": "#fff",
+    "@badge-link-hover-color": "#fff",
+    "@badge-bg": "@gray-light",
+    "@badge-active-color": "@link-color",
+    "@badge-active-bg": "#fff",
+    "@badge-font-weight": "bold",
+    "@badge-line-height": "1",
+    "@badge-border-radius": "10px",
+    "@breadcrumb-padding-vertical": "8px",
+    "@breadcrumb-padding-horizontal": "15px",
+    "@breadcrumb-bg": "#f5f5f5",
+    "@breadcrumb-color": "#ccc",
+    "@breadcrumb-active-color": "@gray-light",
+    "@breadcrumb-separator": "\"/\"",
+    "@carousel-text-shadow": "0 1px 2px rgba(0,0,0,.6)",
+    "@carousel-control-color": "#fff",
+    "@carousel-control-width": "15%",
+    "@carousel-control-opacity": ".5",
+    "@carousel-control-font-size": "20px",
+    "@carousel-indicator-active-bg": "#fff",
+    "@carousel-indicator-border-color": "#fff",
+    "@carousel-caption-color": "#fff",
+    "@close-font-weight": "bold",
+    "@close-color": "#000",
+    "@close-text-shadow": "0 1px 0 #fff",
+    "@code-color": "#c7254e",
+    "@code-bg": "#f9f2f4",
+    "@kbd-color": "#fff",
+    "@kbd-bg": "#333",
+    "@pre-bg": "#f5f5f5",
+    "@pre-color": "@gray-dark",
+    "@pre-border-color": "#ccc",
+    "@pre-scrollable-max-height": "340px",
+    "@component-offset-horizontal": "180px",
+    "@text-muted": "@gray-light",
+    "@abbr-border-color": "@gray-light",
+    "@headings-small-color": "@gray-light",
+    "@blockquote-small-color": "@gray-light",
+    "@blockquote-font-size": "(@font-size-base * 1.25)",
+    "@blockquote-border-color": "@gray-lighter",
+    "@page-header-border-color": "@gray-lighter",
+    "@dl-horizontal-offset": "@component-offset-horizontal",
+    "@hr-border": "@gray-lighter"
+  },
+  "css": [
+    "print.less",
+    "type.less",
+    "code.less",
+    "tables.less",
+    "forms.less",
+    "buttons.less"
+  ],
+  "js": [],
+  "customizerUrl": "http://getbootstrap.com/customize/?id=572bbf800700ea752a72"
+}