passenger 5.0.7 → 5.0.8

data/lib/phusion_passenger/config/install_agent_command.rb

@@ -84,6 +84,10 @@ module PhusionPassenger
             options[:download_args] << "     "
             options[:download_args] << "--no-download-progress"
           end
+          opts.on("--auto", "Run in non-interactive mode. Default when#{nl}" +
+            "stdin or stdout is not a TTY") do
+            options[:compile_args] << "--auto"
+          end
           opts.on("-f", "--force", "Skip sanity checks") do
             options[:force] = true
             options[:download_args] << "--force"

data/lib/phusion_passenger/config/install_standalone_runtime_command.rb

@@ -91,6 +91,8 @@ module PhusionPassenger
           opts.on("--nginx-version VERSION", String, "Nginx version to compile. " +
             "Default: #{PREFERRED_NGINX_VERSION}") do |val|
             options[:nginx_version] = val
+            options[:compile_args] << "--nginx-version"
+            options[:compile_args] << val
           end
           opts.on("--nginx-tarball PATH", String, "Use the given Nginx tarball instead of#{nl}" +
             "downloading it. You MUST also specify the#{nl}" +
@@ -106,6 +108,10 @@ module PhusionPassenger
             options[:download_args] << "     "
             options[:download_args] << "--no-download-progress"
           end
+          opts.on("--auto", "Run in non-interactive mode. Default when#{nl}" +
+            "stdin or stdout is not a TTY") do
+            options[:install_agent_args] << "--auto"
+          end
           opts.on("-f", "--force", "Skip sanity checks") do
             options[:force] = true
             options[:install_agent_args] << "--force"

data/lib/phusion_passenger/config/installation_utils.rb

@@ -1,7 +1,7 @@
 # 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.
 #
@@ -233,7 +233,13 @@ module PhusionPassenger
 
       def render_template(name, options = {})
         options.merge!(:colors => @colors || PhusionPassenger::Utils::AnsiColors.new)
-        puts ConsoleTextTemplate.new({ :file => "config/#{name}" }, options).result
+        # This check here is necessary for NginxEngineCompiler. NginxEngineCompiler
+        # derives from AbstractInstaller but also includes InstallationUtils. We want
+        # the AbstractInstaller methods to work when they call render_template.
+        if !File.exist?("#{PhusionPassenger.resources_dir}/templates/#{name}.txt.erb")
+          name = "config/#{name}"
+        end
+        puts ConsoleTextTemplate.new({ :file => name }, options).result
       end
     end
 

data/lib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -84,7 +84,9 @@ module PhusionPassenger
         puts "<banner>Installing...</banner>"
         download_and_extract_nginx_sources
         determine_support_libraries
-        compile_support_libraries
+        if PhusionPassenger.build_system_dir
+          compile_support_libraries
+        end
         configure_and_compile_nginx
       end
 
@@ -230,11 +232,18 @@ module PhusionPassenger
       end
 
       def determine_support_libraries
-        lib_dir = "#{@working_dir}/common/libpassenger_common"
-        @support_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
-          set_output_dir(lib_dir).
-          link_objects
-        @support_libs << "#{@working_dir}/common/libboost_oxt.a"
+        if PhusionPassenger.build_system_dir
+          lib_dir = "#{@working_dir}/common/libpassenger_common"
+          @support_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
+            set_output_dir(lib_dir).
+            link_objects
+          @support_libs << "#{@working_dir}/common/libboost_oxt.a"
+        else
+          @support_libs = COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).
+            set_output_dir("#{PhusionPassenger.lib_dir}/common/libpassenger_common").
+            link_objects
+          @support_libs << "#{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
+        end
         @support_libs_string = @support_libs.join(" ")
       end
 
@@ -295,7 +304,7 @@ module PhusionPassenger
         command << "#{shell} ./configure --prefix=/tmp " +
           "#{STANDALONE_NGINX_CONFIGURE_OPTIONS} " +
           "--add-module=#{Shellwords.escape PhusionPassenger.nginx_module_source_dir}"
-        run_command_yield_activity(command) do |throbber|
+        run_command_yield_activity(command) do
           yield
         end
       end

data/lib/phusion_passenger/config/validate_install_command.rb

@@ -42,14 +42,14 @@ module PhusionPassenger
         parse_options
         prepare
         begin
-          if !@options[:auto]
+          if !@options[:auto] && !@options[:invoked_from_installer]
             ask_what_to_validate
-            if @options[:validate_apache2]
-              initialize_apache_envvars
+          end
+          if @options[:validate_apache2]
+            initialize_apache_envvars
+            if !@options[:auto] && !@options[:invoked_from_installer]
               check_whether_there_are_multiple_apache_installs
             end
-          elsif @options[:validate_apache2]
-            initialize_apache_envvars
           end
 
           if @options[:validate_passenger]
@@ -57,7 +57,9 @@ module PhusionPassenger
             check_no_other_installs_in_path
           end
           if @options[:validate_apache2]
-            check_apache2_load_module_config
+            if check_apache2_installed
+              check_apache2_load_module_config
+            end
           end
 
           if @options[:summary]
@@ -147,6 +149,7 @@ module PhusionPassenger
         PhusionPassenger.require_passenger_lib 'platform_info/ruby'
         PhusionPassenger.require_passenger_lib 'platform_info/apache'
         PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
+        PhusionPassenger.require_passenger_lib 'platform_info/depcheck'
         require 'stringio'
         require 'pathname'
 
@@ -239,9 +242,16 @@ module PhusionPassenger
         # These may not be in PATH if the user did not run this command through sudo.
         paths << "/usr/bin"
         paths << "/usr/sbin"
-        paths.delete(gem_bindir)
-        paths.delete(homebrew_bindir)
-        paths.delete(PhusionPassenger.bin_dir)
+        # Some of the paths may be symlinks, so we take the realpaths when
+        # possible and remove duplicates. This is especially important on
+        # Red Hat 7, where /bin is a symlink to /usr/bin.
+        paths.map! do |path|
+          try_realpath(path)
+        end
+
+        paths.delete(try_realpath(gem_bindir))
+        paths.delete(try_realpath(homebrew_bindir))
+        paths.delete(try_realpath(PhusionPassenger.bin_dir))
         paths.uniq!
 
         other_installs = []
@@ -272,6 +282,11 @@ module PhusionPassenger
       end
 
       def check_whether_there_are_multiple_apache_installs
+        if PlatformInfo.httpd.nil? || PlatformInfo.apxs2.nil?
+          # check_apache2_installed will handle this.
+          return
+        end
+
         log '<banner>Checking whether there are multiple Apache installations...</banner>'
 
         output = StringIO.new
@@ -358,6 +373,55 @@ module PhusionPassenger
         end
       end
 
+      def check_apache2_installed
+        checking "whether Apache is installed"
+
+        if PlatformInfo.httpd
+          if PlatformInfo.apxs2
+            check_ok
+            true
+          else
+            check_error
+
+            PlatformInfo::Depcheck.load("depcheck_specs/apache2")
+            dep = PlatformInfo::Depcheck.find("apache2-dev")
+            install_instructions = dep.install_instructions.split("\n").join("\n              ")
+
+            if !@options[:invoked_from_installer]
+              next_step = "When done, please re-run this program."
+            end
+
+            suggest %Q{
+              Unable to validate your Apache installation: more software required
+
+              This program requires the <b>apxs2</b> tool in order to be able to validate your
+              Apache installation. This tool is currently not installed. You can solve this
+              as follows:
+
+              #{install_instructions}
+
+              #{next_step}
+            }
+
+            false
+          end
+        else
+          check_error
+
+          PlatformInfo::Depcheck.load("depcheck_specs/apache2")
+          dep = PlatformInfo::Depcheck.find("apache2")
+          install_instructions = dep.install_instructions.split("\n").join("\n            ")
+
+          suggest %Q{
+            Apache is not installed. You can solve this as follows:
+
+            #{install_instructions}
+          }
+
+          false
+        end
+      end
+
       def check_apache2_load_module_config
         checking "whether the Passenger module is correctly configured in Apache"
 
@@ -455,8 +519,8 @@ module PhusionPassenger
             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
+          module_path = try_realpath(module_path)
+          expected_module_path = try_realpath(PhusionPassenger.apache2_module_path)
 
           if module_path == expected_module_path
             check_ok
@@ -653,6 +717,18 @@ module PhusionPassenger
       def ruby_command
         PlatformInfo.ruby_command
       end
+
+      def try_realpath(path)
+        if path
+          begin
+            Pathname.new(path).realpath.to_s
+          rescue Errno::ENOENT, Errno::EACCES
+            path
+          end
+        else
+          nil
+        end
+      end
     end
 
   end # module Config

data/lib/phusion_passenger/constants.rb

@@ -53,6 +53,8 @@ module PhusionPassenger
     DEFAULT_WEB_APP_USER = "nobody"
     DEFAULT_APP_ENV = "production"
     DEFAULT_SPAWN_METHOD = "smart"
+    # Apache's unixd.h also defines DEFAULT_USER, so we avoid naming clash here.
+    PASSENGER_DEFAULT_USER = "nobody"
     DEFAULT_CONCURRENCY_MODEL = "process"
     DEFAULT_STICKY_SESSIONS_COOKIE_NAME = "_passenger_route"
     DEFAULT_APP_THREAD_COUNT = 1

data/lib/phusion_passenger/platform_info/apache.rb

@@ -112,10 +112,26 @@ module PhusionPassenger
       else
         apache2ctl = self.apache2ctl
       end
-      if apache2ctl
+      if os_name == "linux" &&
+         linux_distro_tags.include?(:gentoo) &&
+         apache2ctl == "/usr/sbin/apache2ctl"
+        # On Gentoo, `apache2ctl -V` doesn't forward the command to `apache2 -V`,
+        # but instead prints the OpenRC init system's version.
+        # https://github.com/phusion/passenger/issues/1510
+        if options
+          httpd = options[:httpd] || self.httpd(options)
+        else
+          httpd = self.httpd
+        end
+        version_command = httpd
+      else
+        version_command = apache2ctl
+      end
+
+      if version_command
         create_temp_file("apache2ctl_V") do |filename, f|
           e_filename = Shellwords.escape(filename)
-          output = `#{apache2ctl} -V 2>#{e_filename}`
+          output = `#{version_command} -V 2>#{e_filename}`
 
           stderr_text = File.open(filename, "rb") do |f2|
             f2.read
@@ -545,22 +561,31 @@ module PhusionPassenger
         flags << "-fPIC"
       end
       if with_apr_flags
-        flags << apr_flags
-        flags << apu_flags
+        if language == :c
+          flags << apr_cflags
+          flags << apu_cflags
+        else
+          flags << apr_cxxflags
+          flags << apu_cxxflags
+        end
       end
       if !apxs2.nil?
         apxs2_flags = `#{apxs2} -q CFLAGS`.strip << " -I" << `#{apxs2} -q INCLUDEDIR`.strip
         apxs2_flags.gsub!(/-O\d? /, '')
 
-        # Remove flags not supported by GCC
-        if os_name =~ /solaris/ # TODO: Add support for people using SunStudio
-          # The big problem is Coolstack apxs includes a bunch of solaris -x directives.
-          options = apxs2_flags.split
-          options.reject! { |f| f =~ /^\-x/ }
-          options.reject! { |f| f =~ /^\-Xa/ }
-          options.reject! { |f| f =~ /^\-fast/ }
-          options.reject! { |f| f =~ /^\-mt/ }
-          apxs2_flags = options.join(' ')
+        if os_name =~ /solaris/
+          if (language == :c && !cc_is_sun_studio?) || (language == :cxx && !cxx_is_sun_studio?)
+            # Remove flags not supported by GCC
+            # The big problem is Coolstack apxs includes a bunch of solaris -x directives.
+            options = apxs2_flags.split
+            options.reject! { |f| f =~ /^\-x/ }
+            options.reject! { |f| f =~ /^\-Xa/ }
+            options.reject! { |f| f =~ /^\-fast/ }
+            options.reject! { |f| f =~ /^\-mt/ }
+            options.reject! { |f| f =~ /^\-W2/ }
+            apxs2_flags = options.join(' ')
+            apxs2_flags.gsub!(/ ?-Qoption cg ?/, " ")
+          end
         end
 
         if os_name == "linux" &&
@@ -629,30 +654,50 @@ module PhusionPassenger
       else
         flags = "-fPIC"
       end
-      flags << " #{apr_libs} #{apu_libs}"
+      flags << " #{apr_cxx_ldflags} #{apu_cxx_ldflags}"
       flags.strip!
       return flags
     end
     memoize :apache2_module_cxx_ldflags
 
     # The C compiler flags that are necessary for programs that use APR.
-    def self.apr_flags
-      return determine_apr_info[0]
+    def self.apr_cflags
+      determine_apr_c_info[0]
+    end
+
+    # The C++ compiler flags that are necessary for programs that use APR.
+    def self.apr_cxxflags
+      determine_apr_c_info[0]
     end
 
     # The linker flags that are necessary for linking programs that use APR.
-    def self.apr_libs
-      return determine_apr_info[1]
+    def self.apr_c_ldflags
+      determine_apr_c_info[1]
+    end
+
+    # The linker flags that are necessary for linking C++ programs that use APR.
+    def self.apr_cxx_ldflags
+      determine_apr_cxx_info[1]
     end
 
     # The C compiler flags that are necessary for programs that use APR-Util.
-    def self.apu_flags
-      return determine_apu_info[0]
+    def self.apu_cflags
+      determine_apu_c_info[0]
+    end
+
+    # The C++ compiler flags that are necessary for programs that use APR-Util.
+    def self.apu_cxxflags
+      determine_apu_cxx_info[0]
     end
 
-    # The linker flags that are necessary for linking programs that use APR-Util.
-    def self.apu_libs
-      return determine_apu_info[1]
+    # The linker flags that are necessary for linking C programs that use APR-Util.
+    def self.apu_c_ldflags
+      determine_apu_c_info[1]
+    end
+
+    # The linker flags that are necessary for linking C++ programs that use APR-Util.
+    def self.apu_cxx_ldflags
+      determine_apu_cxx_info[1]
     end
 
     ################ Miscellaneous information ################
@@ -670,38 +715,74 @@ module PhusionPassenger
     memoize :apr_config_needed_for_building_apache_modules?, true
 
   private
-    def self.determine_apr_info
+    def self.determine_apr_info(language)
       if apr_config.nil?
-        return [nil, nil]
+        [nil, nil]
       else
         flags = `#{apr_config} --cppflags --includes`.strip
         libs = `#{apr_config} --link-ld`.strip
         flags.gsub!(/-O\d? /, '')
         if os_name =~ /solaris/
-          # Remove flags not supported by GCC
-          flags = flags.split(/ +/).reject{ |f| f =~ /^\-mt/ }.join(' ')
+          if (language == :c && !cc_is_sun_studio?) || (language == :cxx && !cxx_is_sun_studio?)
+            # Remove flags not supported by non-Sun Studio compilers
+            flags = flags.split(/ +/).reject do |f|
+              f =~ /^\-mt/
+            end
+            flags = flags.join(' ')
+          end
         elsif os_name =~ /aix/
           libs << " -Wl,-G -Wl,-brtl"
         end
-        return [flags, libs]
+        [flags, libs]
       end
     end
-    memoize :determine_apr_info, true
     private_class_method :determine_apr_info
 
-    def self.determine_apu_info
+    def self.determine_apr_c_info
+      determine_apr_info(:c)
+    end
+    private_class_method :determine_apr_c_info
+    memoize :determine_apr_c_info, true
+
+    def self.determine_apr_cxx_info
+      determine_apr_info(:cxx)
+    end
+    private_class_method :determine_apr_cxx_info
+    memoize :determine_apr_cxx_info, true
+
+    def self.determine_apu_info(language)
       if apu_config.nil?
-        return [nil, nil]
+        [nil, nil]
       else
         flags = `#{apu_config} --includes`.strip
         libs = `#{apu_config} --link-ld`.strip
         flags.gsub!(/-O\d? /, '')
-        return [flags, libs]
+        if os_name =~ /solaris/
+          if (language == :c && !cc_is_sun_studio?) || (language == :cxx && !cxx_is_sun_studio?)
+            # Remove flags not supported by non-Sun Studio compilers
+            flags = flags.split(/ +/).reject do |f|
+              f =~ /^\-mt/
+            end
+            flags = flags.join(' ')
+          end
+        end
+        [flags, libs]
       end
     end
-    memoize :determine_apu_info, true
     private_class_method :determine_apu_info
 
+    def self.determine_apu_c_info
+      determine_apu_info(:c)
+    end
+    private_class_method :determine_apu_c_info
+    memoize :determine_apu_c_info, true
+
+    def self.determine_apu_cxx_info
+      determine_apu_info(:cxx)
+    end
+    private_class_method :determine_apu_cxx_info
+    memoize :determine_apu_cxx_info, true
+
     def self.scan_for_included_apache2_config_files(config_file, state, options = nil)
       begin
         config = File.open(config_file, "rb") do |f|