passenger 5.0.6 → 5.0.7

data/ext/common/agents/LoggingAgent/Main.cpp

@@ -192,6 +192,10 @@ initializePrivilegedWorkingObjects() {
 	foreach (description, authorizations) {
 		parseAndAddAdminAuthorization(description);
 	}
+
+	// Initialize ResourceLocator here in case passenger_root's parent
+	// directory is not executable by the unprivileged user.
+	wo->resourceLocator = new ResourceLocator(options.get("passenger_root"));
 }
 
 static void
@@ -280,7 +284,6 @@ initializeUnprivilegedWorkingObjects() {
 	WorkingObjects *wo = workingObjects;
 	int fd;
 
-	wo->resourceLocator = new ResourceLocator(options.get("passenger_root"));
 	options.set("union_station_gateway_cert", findUnionStationGatewayCert(
 		*wo->resourceLocator, options.get("union_station_gateway_cert", false)));
 

data/ext/nginx/CacheLocationConfig.c

@@ -68,6 +68,14 @@ u_char int_buf[32], *end, *buf, *pos;
 	
 
 	
+		if (conf->meteor_app_settings.data != NULL) {
+			len += sizeof("!~PASSENGER_METEOR_APP_SETTINGS: ") - 1;
+			len += conf->meteor_app_settings.len;
+			len += sizeof("\r\n") - 1;
+		}
+	
+
+	
 		if (conf->environment.data != NULL) {
 			len += sizeof("!~PASSENGER_APP_ENV: ") - 1;
 			len += conf->environment.len;
@@ -337,6 +345,18 @@ if (buf == NULL) {
 	
 
 	
+		if (conf->meteor_app_settings.data != NULL) {
+			pos = ngx_copy(pos,
+				"!~PASSENGER_METEOR_APP_SETTINGS: ",
+				sizeof("!~PASSENGER_METEOR_APP_SETTINGS: ") - 1);
+			pos = ngx_copy(pos,
+				conf->meteor_app_settings.data,
+				conf->meteor_app_settings.len);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+		}
+	
+
+	
 		if (conf->environment.data != NULL) {
 			pos = ngx_copy(pos,
 				"!~PASSENGER_APP_ENV: ",

data/ext/nginx/Configuration.c

@@ -1397,6 +1397,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, analytics_log_group),
       NULL },
 
+    { ngx_string("passenger_read_timeout"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_msec_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, upstream_config.read_timeout),
+      NULL },
+
     { ngx_string("union_station_gateway_address"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,

data/ext/nginx/ConfigurationCommands.c

@@ -79,6 +79,16 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_meteor_app_settings"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_str_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, meteor_app_settings),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_app_env"),

data/ext/nginx/ConfigurationFields.h

@@ -91,6 +91,8 @@
 
 	ngx_str_t group;
 
+	ngx_str_t meteor_app_settings;
+
 	ngx_str_t nodejs;
 
 	ngx_str_t python;

data/ext/nginx/ContentHandler.c

@@ -138,6 +138,16 @@ map_uri_to_page_cache_file(ngx_http_request_t *r, ngx_str_t *public_dir,
         }
         end = ngx_copy(end, "index.html", sizeof("index.html"));
 
+    } else if (filename[filename_len - 1] == '/') {
+        /* if the filename ends with '/' check for filename + "index.html". */
+        
+        if (filename_len + sizeof("index.html") > page_cache_file->len) {
+            /* Page cache filename doesn't fit in the buffer. */
+            return 0;
+        }
+        
+        end = ngx_copy(page_cache_file->data, filename, filename_len);
+        end = ngx_copy(end, "index.html", sizeof("index.html"));
     } else {
         /* Otherwise, the page cache file is just filename + ".html". */
 

data/ext/nginx/CreateLocationConfig.c

@@ -59,6 +59,11 @@
 	
 
 	
+		conf->meteor_app_settings.data = NULL;
+		conf->meteor_app_settings.len  = 0;
+	
+
+	
 		conf->environment.data = NULL;
 		conf->environment.len  = 0;
 	

data/ext/nginx/MergeLocationConfig.c

@@ -64,6 +64,12 @@
 	
 
 	
+		ngx_conf_merge_str_value(conf->meteor_app_settings,
+			prev->meteor_app_settings,
+			NULL);
+	
+
+	
 		ngx_conf_merge_str_value(conf->environment,
 			prev->environment,
 			NULL);

data/helper-scripts/meteor-loader.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -110,7 +110,20 @@ module PhusionPassenger
         # Meteor its own process group, and sending signals to the
         # entire process group.
         Process.setpgrp
-        exec("meteor run -p #{port} #{production}")
+        
+        if options["environment"] == "production"
+          puts("Warning: meteor running in simulated production mode (--production). For real production use, bundle your app.")
+        end
+        
+        if options["meteor_app_settings"]
+          PhusionPassenger.require_passenger_lib 'utils/shellwords'
+          app_settings_file = Shellwords.escape(options["meteor_app_settings"])
+          puts("Using application settings from file #{app_settings_file}")
+          exec("meteor run -p #{port} --settings #{app_settings_file} #{production}")
+        else
+          exec("meteor run -p #{port} #{production}")
+        end
+        exec("meteor run -p #{port} #{production} --settings settings.json")
       end
       $0 = options["process_title"] if options["process_title"]
       $0 = "#{$0} (#{pid})"

data/helper-scripts/rack-loader.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2014 Phusion
+#  Copyright (c) 2013-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -94,12 +94,8 @@ module PhusionPassenger
       LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
       LoaderSharedHelpers.run_load_path_setup_code(options)
       LoaderSharedHelpers.before_loading_app_code_step2(options)
+      LoaderSharedHelpers.activate_gem 'rack'
 
-      begin
-        require 'rubygems'
-      rescue LoadError
-      end
-      require 'rack'
       rackup_file = options["startup_file"] || "config.ru"
       rackup_code = ::File.open(rackup_file, 'rb') do |f|
         f.read

data/helper-scripts/rack-preloader.rb

@@ -98,12 +98,8 @@ module PhusionPassenger
       LoaderSharedHelpers.before_loading_app_code_step1('config.ru', options)
       LoaderSharedHelpers.run_load_path_setup_code(options)
       LoaderSharedHelpers.before_loading_app_code_step2(options)
+      LoaderSharedHelpers.activate_gem 'rack'
 
-      begin
-        require 'rubygems'
-      rescue LoadError
-      end
-      require 'rack'
       rackup_file = options["startup_file"] || "config.ru"
       rackup_code = ::File.open(rackup_file, 'rb') do |f|
         f.read

data/lib/phusion_passenger.rb

@@ -30,10 +30,10 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.6'
+  VERSION_STRING = '5.0.7'
 
-  PREFERRED_NGINX_VERSION = '1.6.2'
-  NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'
+  PREFERRED_NGINX_VERSION = '1.6.3'
+  NGINX_SHA256_CHECKSUM = '0a98e95b366e4d6042f331e1fa4d70e18fd1e49d8993e589008e70e742b7e757'
 
   PREFERRED_PCRE_VERSION  = '8.34'
   PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'

data/lib/phusion_passenger/apache2/config_options.rb

@@ -69,6 +69,11 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
     :type => :string,
     :desc => "The Node.js command to use."
   },
+  {
+      :name => "PassengerMeteorAppSettings",
+      :type => :string,
+      :desc => "Settings file for (non-bundled) Meteor apps."
+  },
   {
     :name => "PassengerAppEnv",
     :type => :string,

data/lib/phusion_passenger/config/command.rb

@@ -30,6 +30,15 @@ module PhusionPassenger
         @options = self.class.create_default_options
       end
 
+      def run_and_get_exit_code
+        begin
+          run
+          exit(0)
+        rescue SystemExit => e
+          e.status
+        end
+      end
+
     private
       def self.create_default_options
         return {}

data/lib/phusion_passenger/config/install_standalone_runtime_command.rb

@@ -214,6 +214,10 @@ module PhusionPassenger
       end
 
       def download_nginx_engine
+        if @options[:nginx_version] != PREFERRED_NGINX_VERSION
+          return false
+        end
+
         if @options[:brief]
           puts " --> Installing Nginx #{@options[:nginx_version]} engine"
         else

data/lib/phusion_passenger/config/validate_install_command.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,6 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'optparse'
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
@@ -33,61 +34,174 @@ module PhusionPassenger
       FAIL_EXIT_CODE = 1
       # Signifies that there are no error, but at least 1 warning.
       WARN_EXIT_CODE = 2
+      # Internal error occurred.
+      INTERNAL_ERROR_CODE = 9
 
-      def self.help
-        puts "Usage: passenger-config validate-install"
-        puts "Validate this #{PROGRAM_NAME} installation."
-        puts
-        puts "Exit codes:"
-        puts "  0 - All checks passed. No errors, no warnings."
-        puts "  #{FAIL_EXIT_CODE} - There are some errors."
-        puts "  #{WARN_EXIT_CODE} - There are no errors, but there are some warnings."
+      def run
+        @orig_argv = @argv.dup
+        parse_options
+        prepare
+        begin
+          if !@options[:auto]
+            ask_what_to_validate
+            if @options[:validate_apache2]
+              initialize_apache_envvars
+              check_whether_there_are_multiple_apache_installs
+            end
+          elsif @options[:validate_apache2]
+            initialize_apache_envvars
+          end
+
+          if @options[:validate_passenger]
+            check_tools_in_path
+            check_no_other_installs_in_path
+          end
+          if @options[:validate_apache2]
+            check_apache2_load_module_config
+          end
+
+          if @options[:summary]
+            summarize
+          end
+          exit(FAIL_EXIT_CODE) if @error_count > 0
+          exit(WARN_EXIT_CODE) if @warning_count > 0
+        ensure
+          reset_terminal
+        end
       end
 
-      def run
-        if @argv[0] == '--help'
-          self.class.help
-          exit
-        elsif @argv.size > 0
-          self.class.help
-          exit 1
+    private
+      def self.create_default_options
+        return {
+          :auto => !STDIN.tty?,
+          :validate_passenger => true,
+          :colors => STDOUT.tty?,
+          :summary => true
+        }
+      end
+
+      def self.create_option_parser(options)
+        OptionParser.new do |opts|
+          nl = "\n" + ' ' * 37
+          opts.banner = "Usage: passenger-config validate-install [OPTIONS]\n"
+          opts.separator ""
+          opts.separator "  Validate this #{SHORT_PROGRAM_NAME} installation and/or its integration with web servers."
+          opts.separator "  If you run this command in a terminal, it will run interactively and ask you questions."
+          opts.separator "  You can run this command non-interactively either by running it without a terminal, "
+          opts.separator "  or by passing --auto."
+          opts.separator ""
+          opts.separator "  When running non-interactively, the default is to validate the #{SHORT_PROGRAM_NAME}"
+          opts.separator "  installation only (so e.g. Apache is not validated). You can customize this"
+          opts.separator "  using the appropriate command line options."
+          opts.separator ""
+          opts.separator "  The exit codes are as follows:"
+          opts.separator "    0 - All checks passed. No errors, no warnings."
+          opts.separator "    #{FAIL_EXIT_CODE} - Some checks failed with an error."
+          opts.separator "    #{WARN_EXIT_CODE} - No checks failed with an error, but some failed produced warnings."
+          opts.separator "    #{INTERNAL_ERROR_CODE} - Some internal error occurred."
+          opts.separator ""
+
+          opts.separator "Options:"
+          opts.on("--auto", "Run non-interactively") do
+            options[:auto] = true
+          end
+          opts.on("--no-validate-passenger", "Do not validate the #{SHORT_PROGRAM_NAME} installation#{nl}" +
+            "itself") do
+            options[:validate_passenger] = false
+          end
+          opts.on("--validate-apache2", "Validate Apache 2 integration") do
+            options[:validate_apache2] = true
+          end
+          opts.on("--apxs2-path=PATH", String, "Apache installation to validate") do |val|
+            ENV['APXS2'] = val
+          end
+          opts.separator ""
+          opts.on("--no-colors", "Never output colors") do
+            options[:colors] = false
+          end
+          opts.on("--no-summary", "Do not display a summary") do
+            options[:summary] = false
+          end
+          opts.separator ""
+          opts.on("-h", "--help", "Show this help") do
+            options[:help] = true
+          end
+
+          opts.separator ""
+          opts.separator "Internal options:"
+          opts.on("--invoked-from-installer", "Indicate that this program is invoked from#{nl}" +
+            "passenger-install-apache2-module") do
+            options[:invoked_from_installer] = true
+          end
         end
+      end
 
+      def prepare
         begin
           require 'rubygems'
         rescue LoadError
         end
         PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
+        PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
         PhusionPassenger.require_passenger_lib 'platform_info'
+        PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+        PhusionPassenger.require_passenger_lib 'platform_info/apache'
+        PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
+        require 'stringio'
+        require 'pathname'
 
         @error_count = 0
         @warning_count = 0
 
-        prepare_terminal
-        begin
-          check_tools_in_path
-          check_no_other_installs_in_path
+        @colors = Utils::AnsiColors.new(@options[:colors])
 
-          exit(FAIL_EXIT_CODE) if @error_count > 0
-          exit(WARN_EXIT_CODE) if @warning_count > 0
-        ensure
-          reset_terminal
-        end
+        prepare_terminal
       end
 
-    private
       def prepare_terminal
-        STDOUT.write(Utils::AnsiColors::DEFAULT_TERMINAL_COLOR)
+        STDOUT.write(@colors.default_terminal_color)
         STDOUT.flush
       end
 
       def reset_terminal
-        STDOUT.write(Utils::AnsiColors::RESET)
+        STDOUT.write(@colors.reset)
         STDOUT.flush
       end
 
+      def ask_what_to_validate
+        log "<banner>What would you like to validate?</banner>"
+        log "Use <space> to select."
+        log "<dgray>If the menu doesn't display correctly, press '!'</dgray>"
+        puts
+
+        menu = Utils::TerminalChoiceMenu.new([
+          "#{SHORT_PROGRAM_NAME} itself",
+          "Apache"
+        ])
+        menu["#{SHORT_PROGRAM_NAME} itself"].checked = @options[:validate_passenger]
+        menu["Apache"].checked = @options[:validate_apache2]
+
+        begin
+          menu.query
+        rescue Interrupt
+          exit(INTERNAL_ERROR_CODE)
+        end
+        display_separator
+
+        @options[:validate_passenger] = menu.selected_choices.include?("#{SHORT_PROGRAM_NAME} itself")
+        @options[:validate_apache2] = menu.selected_choices.include?("Apache")
+      end
+
+      def initialize_apache_envvars
+        # The Apache executable may be located in an 'sbin' folder. We add
+        # the 'sbin' folders to $PATH just in case. On some systems
+        # 'sbin' isn't in $PATH unless the user is logged in as root from
+        # the start (i.e. not via 'su' or 'sudo').
+        ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
+      end
+
       def check_tools_in_path
-        checking "whether this #{PROGRAM_NAME} install is in PATH"
+        checking "whether this #{SHORT_PROGRAM_NAME} install is in PATH"
         paths = ENV['PATH'].to_s.split(':')
         if paths.include?(gem_bindir) ||
            paths.include?(homebrew_bindir) ||
@@ -98,7 +212,7 @@ module PhusionPassenger
           suggest %Q{
             Please add #{PhusionPassenger.bin_dir} to PATH.
             Otherwise you will get "command not found" errors upon running
-            passenger-status and other tools.
+            any Passenger commands.
 
             Learn more at about PATH at:
 
@@ -108,7 +222,7 @@ module PhusionPassenger
       end
 
       def check_no_other_installs_in_path
-        logn " * Checking whether there are no other #{PROGRAM_NAME} installations... "
+        checking "whether there are no other #{SHORT_PROGRAM_NAME} installations"
 
         paths = ENV['PATH'].to_s.split(':')
         if Process.uid == 0 &&
@@ -132,7 +246,7 @@ module PhusionPassenger
 
         other_installs = []
         paths.each do |path|
-          filename = "#{path}/passenger-config"
+          filename = "#{path}/passenger"
           if File.exist?(filename)
             other_installs << filename
           end
@@ -142,16 +256,282 @@ module PhusionPassenger
         else
           check_warning
           suggest %Q{
-            Besides this #{PROGRAM_NAME} installation, the following other
-            #{PROGRAM_NAME} installations have been detected:
+            You are currently validating against #{PROGRAM_NAME} #{VERSION_STRING}, located in:
 
-              #{other_installs.join("\n\t\t\t\t  ")}
+              #{PhusionPassenger.bin_dir}/passenger
 
-            Please uninstall them to avoid confusion or conflicts.
+            Besides this #{SHORT_PROGRAM_NAME} installation, the following other
+            #{SHORT_PROGRAM_NAME} installations have also been detected:
+
+              #{other_installs.join("\n              ")}
+
+            Please uninstall these other #{SHORT_PROGRAM_NAME} installations to avoid
+            confusion or conflicts.
           }
         end
       end
 
+      def check_whether_there_are_multiple_apache_installs
+        log '<banner>Checking whether there are multiple Apache installations...</banner>'
+
+        output = StringIO.new
+        detector = PlatformInfo::ApacheDetector.new(output)
+        begin
+          detector.detect_all
+          detector.report
+          apache2 = detector.result_for(PlatformInfo.apxs2)
+
+          if apache2.nil?
+            # Print an extra newline because the autodetection routines
+            # may have run some commands which printed stuff to stderr.
+            puts
+
+            if Process.uid == 0
+              # More information will be displayed in #check_no_duplicate_apache2_load_module_config,
+              # which should also fail.
+              log "<red>Your Apache installation appears to be broken. More information will be displayed later.</red>"
+            else
+              whoami = `whoami`.strip
+              sudo = PhusionPassenger::PlatformInfo.ruby_sudo_command
+              selfcommand = "#{PhusionPassenger.bin_dir}/passenger-config validate-install #{@orig_argv.join(' ')}"
+
+              log "<red>Permission problems</red>"
+              log "This program must be able to analyze your Apache installation. But it can't"
+              log "do that, because you're running the installer as <b>#{whoami}</b>."
+              log "Please give this program root privileges, by re-running it with <yellow>#{sudo}</yellow>:"
+              log ""
+              log "  <b>export ORIG_PATH=\"$PATH\"</b>"
+              log "  <b>#{sudo_s_e}</b>"
+              log "  <b>export PATH=\"$ORIG_PATH\"</b>"
+              log "  <b>#{ruby_command} #{selfcommand}</b>"
+              exit(INTERNAL_ERROR_CODE)
+            end
+          elsif detector.results.size > 1
+            other_installs = detector.results - [apache2]
+
+            log "<yellow>Multiple Apache installations detected!</yellow>"
+            log ""
+            log "You are about to validate #{SHORT_PROGRAM_NAME} against the following"
+            log "Apache installation:"
+            log ""
+            log "  <b>Apache #{apache2.version}</b>"
+            log "  <b>apxs2     : #{apache2.apxs2}</b>"
+            log "  <b>Executable: #{apache2.httpd}</b>"
+            log ""
+            log "However, #{other_installs.size} other Apache installation(s) have been found on your system:"
+            log ""
+            other_installs.each do |result|
+              log "  <b>Apache #{result.version}</b>"
+              log "  <b>apxs2     : #{result.apxs2}</b>"
+              log "  <b>Executable: #{result.httpd}</b>"
+              log ""
+            end
+
+            result = prompt_confirmation "Are you sure you want to validate " +
+              "against Apache #{apache2.version} (#{apache2.apxs2})?"
+            if !result
+              puts
+              display_separator
+              other_installs.each do |result|
+                log " * To validate against <yellow>Apache #{result.version} (#{result.apxs2})</yellow>:"
+                log "   Re-run this program with: <b>--apxs2-path '#{result.apxs2}'</b>"
+              end
+              log ""
+              log "You may also want to read the \"Installation\" section of the manual for"
+              log "installation troubleshooting:"
+              log ""
+              log "  #{APACHE2_DOC_URL}"
+              log ""
+              log "If you keep having problems installing, please visit the following website for"
+              log "support:"
+              log ""
+              log "  #{SUPPORT_URL}"
+              exit(INTERNAL_ERROR_CODE)
+            end
+          else
+            log '<green>Only a single installation detected. This is good.</green>'
+          end
+
+          display_separator
+        ensure
+          detector.finish
+        end
+      end
+
+      def check_apache2_load_module_config
+        checking "whether the Passenger module is correctly configured in Apache"
+
+        if PlatformInfo.httpd_default_config_file.nil?
+          check_error
+          passenger_config = "#{PhusionPassenger.bin_dir}/passenger-config"
+          suggest %Q{
+            Your Apache installation might be broken
+
+            You are about to validate #{PROGRAM_NAME} against the following
+            Apache installation:
+
+               apxs2: #{PlatformInfo.apxs2}
+
+            However, this Apache installation appears to be broken, so this program
+            cannot continue. To find out why this program thinks the above Apache
+            installation is broken, run:
+
+               export ORIG_PATH="$PATH"
+               #{sudo_s_e}
+               export PATH="$ORIG_PATH"
+               #{ruby_command} #{passenger_config} --detect-apache2
+          }
+          return
+        end
+
+        result = PlatformInfo.httpd_included_config_files(
+          PlatformInfo.httpd_default_config_file)
+        if !result[:unreadable_files].empty?
+          check_error
+
+          if Process.uid == 0
+            suggest %Q{
+              Permission problems
+
+              This program must be able to analyze your Apache installation. But it can't
+              do that despite running with root privileges. In particular, it failed to
+              read the following files:
+
+                #{result[:unreadable_files].join("\n                ")}
+
+              This program doesn't know why this error occurred. Your system is probably
+              secured using some mechanism that this program is not familiar with. Please
+              consult your operating system's manual to learn which security mechanisms
+              may be preventing this program from accessing the above files. On Linux
+              systems, SELinux and AppArmor might be responsible.
+
+              When you've solved the problem, please re-run this program.
+            }
+          else
+            whoami = `whoami`.strip
+            sudo = PhusionPassenger::PlatformInfo.ruby_sudo_command
+            selfcommand = "#{PhusionPassenger.bin_dir}/passenger-config validate-install #{@orig_argv.join(' ')}"
+
+            suggest %Q{
+              Permission problems
+
+              This program must be able to analyze your Apache installation. But it can't
+              do that, because you're running the installer as '#{whoami}'. In particular,
+              it failed to read the following files:
+
+                #{result[:unreadable_files].join("\n                ")}
+
+              Please give this program root privileges, by re-running it with '#{sudo}':
+
+                 export ORIG_PATH=\"$PATH\"
+                 #{sudo_s_e}
+                 export PATH=\"$ORIG_PATH\"
+                 #{ruby_command} #{selfcommand}
+            }
+          end
+          return
+        end
+
+        occurrences = 0
+        occurrence_files = []
+        module_path = nil
+
+        result[:files].each do |path|
+          lines = File.open(path, "rb") do |f|
+            f.read.split("\n")
+          end
+          lines.each do |line|
+            if line !~ /^[\s\t]*#/ && line =~ /LoadModule[\s\t]+passenger_module[\s\t]+(.*)/
+              module_path = $1
+              occurrences += 1
+              occurrence_files << path
+            end
+          end
+        end
+
+        if occurrences == 1
+          if module_path !~ /^\//
+            # Non-absolute path. Absolutize using ServerRoot.
+            module_path = "#{PlatformInfo.httpd_default_root}/#{module_path}"
+          end
+          # Resolve symlinks.
+          module_path = Pathname.new(module_path).realpath
+          expected_module_path = Pathname.new(PhusionPassenger.apache2_module_path).realpath
+
+          if module_path == expected_module_path
+            check_ok
+          else
+            check_error
+            suggest %Q{
+              Incorrect #{SHORT_PROGRAM_NAME} module path detected
+
+              #{PROGRAM_NAME} for Apache requires a 'LoadModule passenger_module'
+              directive inside an Apache configuration file. This directive has been
+              detected in the following config file:
+
+                 #{occurrence_files[0]}
+
+              However, the directive refers to the following Apache module, which is wrong:
+
+                 #{module_path}
+
+              Please edit the config file and change the directive to this instead:
+
+                 LoadModule passenger_module #{PhusionPassenger.apache2_module_path}
+            }
+          end
+        elsif occurrences == 0
+          if @options[:invoked_from_installer]
+            check_warning
+            suggest %Q{
+              You did not specify 'LoadModule passenger_module' in any of your Apache
+              configuration files. Please paste the configuration snippet that this
+              installer printed earlier, into one of your Apache configuration files, such
+              as #{PlatformInfo.httpd_default_config_file}.
+            }
+          else
+            check_error
+            installer_command = "#{PhusionPassenger.bin_dir}/passenger-install-apache2-module"
+            suggest %Q{
+              You did not specify 'LoadModule passenger_module' in any of your
+              Apache configuration files. This means that #{PROGRAM_NAME}
+              for Apache is not installed or not active. Please run the
+              #{PROGRAM_NAME} Apache module installer:
+
+                 #{ruby_command} #{installer_command} --apxs2=#{PlatformInfo.apxs2}
+            }
+          end
+        else
+          check_error
+
+          suggest %Q{
+            You have #{occurrences} 'LoadModule passenger_module' directives in your Apache
+            configuration files. However, you are only supposed to have one such
+            directive.
+
+            Please fix this by removing all 'LoadModule passenger_module' directives
+            besides the one for #{SHORT_PROGRAM_NAME} version #{VERSION_STRING}. The directives were
+            found in these files:
+
+               #{occurrence_files.uniq.join("\n               ")}
+
+            Note: 'LoadModule passenger_module' may be placed inside the global context
+            only (so not within a VirtualHost).
+          }
+        end
+      end
+
+      def summarize
+        puts
+        if @error_count == 0 && @warning_count == 0
+          log "<green>Everything looks good. :-)</green>"
+        elsif @error_count == 0
+          log "<yellow>Detected 0 error(s), #{@warning_count} warning(s).</yellow>"
+        else
+          log "<red>Detected #{@error_count} error(s), #{@warning_count} warning(s).</red>"
+        end
+      end
+
       # Returns the RubyGems bin dir, if Phusion Passenger is installed through RubyGems.
       def gem_bindir
         if defined?(Gem) &&
@@ -174,20 +554,18 @@ module PhusionPassenger
       end
 
       def logn(message)
-        if STDOUT.tty?
-          STDOUT.write(Utils::AnsiColors.ansi_colorize(message))
-        else
-          STDOUT.write(Utils::AnsiColors.strip_color_tags(message))
-        end
+        STDOUT.write(@colors.ansi_colorize(message))
         STDOUT.flush
       end
 
       def log(message)
-        if STDOUT.tty?
-          STDOUT.puts(Utils::AnsiColors.ansi_colorize(message))
-        else
-          STDOUT.puts(Utils::AnsiColors.strip_color_tags(message))
-        end
+        STDOUT.puts(@colors.ansi_colorize(message))
+      end
+
+      def display_separator
+        puts
+        puts "-------------------------------------------------------------------------"
+        puts
       end
 
       def checking(message)
@@ -214,6 +592,52 @@ module PhusionPassenger
         puts
       end
 
+      def prompt_confirmation(message)
+        result = prompt("#{message} [y/n]") do |value|
+          if value.downcase == 'y' || value.downcase == 'n'
+            true
+          else
+            log "<red>Invalid input '#{value}'; please enter either 'y' or 'n'.</red>"
+            false
+          end
+        end
+        result.downcase == 'y'
+      rescue Interrupt
+        exit(INTERNAL_ERROR_CODE)
+      end
+
+      def prompt(message, default_value = nil)
+        done = false
+        while !done
+          logn "#{message}: "
+
+          if default_value
+            puts default_value
+            return default_value
+          end
+
+          begin
+            result = STDIN.readline
+          rescue EOFError
+            exit(INTERNAL_ERROR_CODE)
+          end
+          result.strip!
+          if result.empty?
+            if default_value
+              result = default_value
+              done = true
+            else
+              done = !block_given? || yield(result)
+            end
+          else
+            done = !block_given? || yield(result)
+          end
+        end
+        result
+      rescue Interrupt
+        exit(INTERNAL_ERROR_CODE)
+      end
+
       def unindent(text)
         return PlatformInfo.send(:unindent, text)
       end
@@ -221,6 +645,14 @@ module PhusionPassenger
       def reindent(text, level)
         return PlatformInfo.send(:reindent, text, level)
       end
+
+      def sudo_s_e
+        PlatformInfo.ruby_sudo_shell_command("-E")
+      end
+
+      def ruby_command
+        PlatformInfo.ruby_command
+      end
     end
 
   end # module Config