passenger 5.1.12 → 5.2.0

data/src/ruby_supportlib/phusion_passenger/apache2/config_utils.rb

@@ -0,0 +1,52 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2014-2017 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+module PhusionPassenger
+  module Apache2
+    module ConfigUtils
+      class << self
+        def initialize!(options)
+          sort(options)
+          set_field_defaults(options)
+        end
+
+      private
+        def sort(options)
+          options.sort! do |a, b|
+            a[:name] <=> b[:name]
+          end
+        end
+
+        def set_field_defaults(options)
+          options.each do |option|
+            option[:context] ||= :application
+            if option[:context] == :location
+              option[:htaccess_context] ||= ['OR_OPTIONS']
+            end
+          end
+        end
+      end
+    end
+  end
+end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -274,6 +274,12 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'Exceptions.o',
     :source   => 'Exceptions.cpp',
     :category => :base
+  define_component 'FileTools/PathManip.o',
+    :source   => 'FileTools/PathManip.cpp',
+    :category => :base
+  define_component 'FileTools/FileManip.o',
+    :source   => 'FileTools/FileManip.cpp',
+    :category => :base
   define_component 'ProcessManagement/Spawn.o',
     :source   => 'ProcessManagement/Spawn.cpp',
     :category => :base
@@ -316,9 +322,6 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'Utils/CachedFileStat.o',
     :source   => 'Utils/CachedFileStat.cpp',
     :category => :other
-  define_component 'Utils/LargeFiles.o',
-    :source   => 'Utils/LargeFiles.cpp',
-    :category => :other
   define_component 'WatchdogLauncher.o',
     :source   => 'WatchdogLauncher.cpp',
     :category => :other
@@ -357,6 +360,16 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'UnionStationFilterSupport.o',
     :source   => 'UnionStationFilterSupport.cpp',
     :category => :union_station_filter
+
+  define_component 'JsonTools/CBindings.o',
+    :source   => 'JsonTools/CBindings.cpp',
+    :category => :json_tools
+  define_component 'FileTools/LargeFiles.o',
+    :source   => 'FileTools/LargeFiles.cpp',
+    :category => :file_tools_large_files
+  define_component 'FileTools/PathManipCBindings.o',
+    :source   => 'FileTools/PathManipCBindings.cpp',
+    :category => :file_tools_path_manip_cbindings
   define_component 'ProcessManagement/Ruby.o',
     :source   => 'ProcessManagement/Ruby.cpp',
     :category => :process_management_ruby
@@ -365,4 +378,5 @@ end
 # A subset of the objects are linked to the Nginx binary. This defines
 # what those objects are.
 NGINX_LIBS_SELECTOR = [:base, 'WatchdogLauncher.o', 'AppTypes.o',
-  'Utils/CachedFileStat.o', 'UnionStationFilterSupport.o']
+  'Utils/CachedFileStat.o', 'JsonTools/CBindings.o',
+  'FileTools/PathManipCBindings.o']

data/src/ruby_supportlib/phusion_passenger/config/main.rb

@@ -45,6 +45,7 @@ module PhusionPassenger
       ["compile-nginx-engine", "CompileNginxEngineCommand"],
 
       ["system-metrics", "SystemMetricsCommand"],
+      ["system-properties", "SystemPropertiesCommand"],
       ["about", "AboutCommand"]
     ]
 
@@ -118,6 +119,7 @@ module PhusionPassenger
       puts
       puts "Miscellaneous commands:"
       puts "  system-metrics        Display system metrics"
+      puts "  system-properties     Display system properties"
       puts
       puts "Run 'passenger-config <COMMAND> --help' for more information about each"
       puts "command."

data/src/ruby_supportlib/phusion_passenger/config/system_properties_command.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2017 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+require 'socket'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'config/command'
+PhusionPassenger.require_passenger_lib 'utils/json'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info/networking'
+PhusionPassenger.require_passenger_lib 'platform_info/linux'
+
+module PhusionPassenger
+  module Config
+
+    class SystemPropertiesCommand < Command
+      def run
+        # Output format must be compatible with Appminton
+        # "get server_properties" protocol command.
+        network_interfaces = PlatformInfo.network_interfaces
+        default_network_interfaces = PlatformInfo.default_network_interfaces
+        puts PhusionPassenger::Utils::JSON.generate(
+          :ipv4_addresses => ip_addresses(network_interfaces, :ipv4, default_network_interfaces),
+          :ipv6_addresses => ip_addresses(network_interfaces, :ipv6, default_network_interfaces),
+          :default_ipv4 => default_ip(network_interfaces, :ipv4, default_network_interfaces),
+          :default_ipv6 => default_ip(network_interfaces, :ipv6, default_network_interfaces),
+          :network_interfaces => network_interfaces,
+          :hostname => Socket.gethostname,
+          :fqdn => fqdn,
+          :os => os
+        )
+      end
+
+    private
+      def ip_addresses(network_interfaces, type, default_network_interfaces)
+        result = network_interfaces.map { |iface| iface[type] }.flatten
+        device = default_network_interfaces[type]
+        if device && device != :unknown
+          default_iface = network_interfaces.find do |iface|
+            iface[:device] == device
+          end
+          result << default_iface[type].first
+        end
+        result.uniq!
+        result
+      end
+
+      def default_ip(network_interfaces, type, default_network_interfaces)
+        device = default_network_interfaces[type]
+        if device == :unknown
+          '<UNKNOWN>'
+        elsif device
+          result = network_interfaces.find do |iface|
+            iface[:device] == device
+          end
+          result[type].first
+        else
+          nil
+        end
+      end
+
+      def fqdn
+        hostname = PlatformInfo.find_command('hostname')
+        if hostname
+          `#{Shellwords.escape hostname} -f`.strip
+        else
+          nil
+        end
+      end
+
+      def os
+        {
+          :simple_name => PlatformInfo.os_name_simple,
+          :full_name => PlatformInfo.os_name_full,
+          :version => PlatformInfo.os_version,
+          :linux_distro => PlatformInfo.linux_distro,
+          :linux_distro_tags => PlatformInfo.linux_distro_tags
+        }
+      end
+    end
+
+  end # module Config
+end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -69,8 +69,6 @@ module PhusionPassenger
     DEFAULT_ANALYTICS_LOG_USER = DEFAULT_WEB_APP_USER
     DEFAULT_ANALYTICS_LOG_GROUP = ""
     DEFAULT_ANALYTICS_LOG_PERMISSIONS = "u=rwx,g=rx,o=rx"
-    DEFAULT_UNION_STATION_GATEWAY_ADDRESS = "gateway.unionstationapp.com"
-    DEFAULT_UNION_STATION_GATEWAY_PORT = 443
     DEFAULT_HTTP_SERVER_LISTEN_ADDRESS = "tcp://127.0.0.1:3000"
     DEFAULT_LVE_MIN_UID = 500
 

data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb

@@ -22,7 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-# This file defines all supported Nginx per-location configuration options. The
+# This file defines all supported Nginx configuration options. The
 # build system automatically generates the corresponding Nginx module boilerplate
 # code from the definitions in this file.
 #
@@ -31,25 +31,36 @@
 #
 # The following boilerplate code is generated:
 #
-#  * ngx_command_t array members (ConfigurationCommands.c.erb)
-#  * Location configuration structure definition (ConfigurationFields.h.erb)
-#  * Location configuration structure initialization (CreateLocationConfig.c.erb)
-#  * Location configuration merging (MergeLocationConfig.c.erb)
-#  * Conversion of configuration options to CGI headers (CacheLocationConfig.c.erb)
+#  * ngx_command_t array members (ConfigGeneral/AutoGeneratedDefinitions.c.cxxcodebuilder)
+#  * Configuration structure definition ({MainConfig,LocationConfig}/AutoGeneratedStruct.h.cxxcodebuilder)
+#  * Configuration structure initialization ({MainConfig/LocationConfig}/AutoGeneratedCreateFunction.c.cxxcodebuilder)
+#  * Configuration merging (LocationConfig/AutoGeneratedMergeFunction.c.cxxcodebuilder)
+#  * Struct field setter functions (ConfigGeneral/AutoGeneratedSetterFuncs.cpp.cxxcodebuilder)
+#  * Nginx module <-> Core headers serialization code (LocationConfig/AutoGeneratedHeaderSerialization.c.cxxcodebuilder)
 #
 # Options:
 #
 #  * name - The configuration option name. Required.
+#  * scope - The scope that applies to this configuration. Required. One of:
+#            :global, :application, :location
 #  * context - The context in which this configuration option is valid.
 #              Defaults to [:main, :srv, :loc, :lif]
 #  * type - This configuration option's value type. Allowed types:
 #           :string, :integer, :uinteger, :flag, :string_array, :string_keyval,
-#           :path
+#           :path, :msec
+#  * default - A static default value. Set during configuration merging,
+#              and reported in the tracking code that generates the
+#              configuration manifest.
+#  * dynamic_default - If this option has a default, but it's dynamically inferred
+#              (and not a static value) then set this option to a human-readable
+#              description that explains how the default is dynamically inferred.
+#              Reported in the tracking code that generates the configuration
+#              manifest.
 #  * take - Tells Nginx how many parameters and what kind of parameter
 #           this configuration option takes. It should be set to a string
 #           such as "NGX_CONF_FLAG".
 #           By default this is automatically inferred from `type`: for
-#           example if `type` is :string then ConfigurationCommands.c.erb
+#           example if `type` is :string then ConfigurationCommands.cxxcodebuilder.erb
 #           will infer that `NGX_CONF_TAKE1` should be used.
 #  * function - The name of the function that should be used to store the
 #               configuration value into the corresponding structure. This function
@@ -62,7 +73,7 @@
 #  * struct - The type of the struct that the field is contained in. Something like
 #             "NGX_HTTP_LOC_CONF_OFFSET" (which is also the default).
 #  * field - The name that should be used for the auto-generated field in
-#            the location configuration structure. Defaults to the configuration
+#            the configuration structure. Defaults to the configuration
 #            name without the 'passenger_' prefix. Set this to nil if you do not
 #            want a structure field to be auto-generated. If the field name contains
 #            a dot (.e.g `upstream_config.pass_headers`) then the structure field will
@@ -76,276 +87,507 @@
 #             will disable auto-generation of CGI header generation code. You are
 #             then responsible for writing CGI header passing code yourself in
 #             ContentHandler.c.
-#  * auto_generate_nginx_merge_code - Whether location configuration merging
+#  * auto_generate_nginx_create_code - Whether configuration initialization
+#            code should be automatically generated. Defaults to true. If you set
+#            this to false then you are responsible for writing initialization code
+#            yourself in Configuration.c.
+#  * auto_generate_nginx_merge_code - Whether configuration merging
 #            code should be automatically generated. Defaults to true. If you set
 #            this to false then you are responsible for writing merging code
 #            yourself in Configuration.c.
+#  * auto_generate_nginx_tracking_code - Whether configuration hierarchy
+#            tracking code should be automatically generated. Defaults to true.
+#            If you set this to false then you are responsible for writing
+#            configuration tracking code yourself in Configuration.c.
 #  * alias_for - Set this if this configuration option is an alias for another
 #                option. Alias definitions must only have the `name` and `alias_for`
 #                fields, nothing else.
 
+PhusionPassenger.require_passenger_lib 'constants'
 
-LOCATION_CONFIGURATION_OPTIONS = [
+NGINX_CONFIGURATION_OPTIONS = [
+  {
+    :name     => 'passenger_root',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET',
+    :field    => 'root_dir'
+  },
+  {
+    :name     => 'passenger_ctl',
+    :scope    => :global,
+    :type     => :string_keyval,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_abort_on_startup_error',
+    :scope    => :global,
+    :type     => :flag,
+    :default  => false,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_log_level',
+    :scope    => :global,
+    :type     => :uinteger,
+    :default  => DEFAULT_LOG_LEVEL,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_log_file',
+    :scope    => :global,
+    :type     => :string,
+    :dynamic_default => "Nginx's global error log",
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_file_descriptor_log_file',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_data_buffer_dir',
+    :scope    => :global,
+    :type     => :string,
+    :dynamic_default => '$TMPDIR, or if not given, /tmp',
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
   {
     :name     => 'passenger_socket_backlog',
-    :type     => :integer,
+    :scope    => :global,
+    :type     => :uinteger,
+    :default  => DEFAULT_SOCKET_BACKLOG,
     :context  => [:main],
     :struct   => "NGX_HTTP_MAIN_CONF_OFFSET"
   },
   {
     :name     => 'passenger_core_file_descriptor_ulimit',
+    :scope    => :global,
     :type     => :uinteger,
+    :dynamic_default => 'The ulimits environment under which Nginx was started',
     :context  => [:main],
     :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
   {
-    :name     => 'disable_security_update_check',
+    :name     => 'passenger_disable_security_update_check',
+    :scope    => :global,
     :type     => :flag,
+    :default  => false,
     :context  => [:main],
-    :struct   => "NGX_HTTP_MAIN_CONF_OFFSET"
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
   {
-    :name     => 'security_update_check_proxy',
+    :name     => 'passenger_security_update_check_proxy',
+    :scope    => :global,
     :type     => :string,
     :context  => [:main],
-    :struct   => "NGX_HTTP_MAIN_CONF_OFFSET"
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_pre_start',
+    :scope    => :global,
+    :type     => :string_array,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET',
+    :field    => 'prestart_uris'
+  },
+  {
+    :name     => 'passenger_instance_registry_dir',
+    :scope    => :global,
+    :type     => :string,
+    :dynamic_default => 'Either /var/run/passenger-instreg, $TMPDIR, or /tmp (see docs)',
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_turbocaching',
+    :scope    => :global,
+    :type     => :flag,
+    :default  => true,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_user_switching',
+    :scope    => :global,
+    :type     => :flag,
+    :default  => true,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_default_user',
+    :scope    => :global,
+    :type     => :string,
+    :default  => PASSENGER_DEFAULT_USER,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_default_group',
+    :scope    => :global,
+    :type     => :string,
+    :dynamic_default => 'The primary group of passenger_default_user',
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_max_pool_size',
+    :scope    => :global,
+    :type     => :uinteger,
+    :default  => DEFAULT_MAX_POOL_SIZE,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_pool_idle_time',
+    :scope    => :global,
+    :type     => :uinteger,
+    :default  => DEFAULT_POOL_IDLE_TIME,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_response_buffer_high_watermark',
+    :scope    => :global,
+    :type     => :uinteger,
+    :default  => DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_stat_throttle_rate',
+    :scope    => :global,
+    :type     => :uinteger,
+    :default  => DEFAULT_STAT_THROTTLE_RATE,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_show_version_in_header',
+    :scope    => :global,
+    :type     => :flag,
+    :default  => true,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
   {
     :name     => 'passenger_app_file_descriptor_ulimit',
-    :type     => :uinteger
+    :scope    => :global,
+    :type     => :uinteger,
+    :dynamic_default => 'passenger_core_file_descriptor_ulimit'
   },
   {
     :name     => 'passenger_enabled',
+    :scope    => :location,
     :type     => :flag,
+    :default  => false,
     :function => 'passenger_enabled',
     :field    => 'enabled',
     :header   => nil
   },
   {
-    :name    => 'passenger_ruby',
-    :context => [:srv, :loc, :lif],
-    :type    => :string
+    :name     => 'passenger_ruby',
+    :scope    => :application,
+    :type     => :string,
+    :default  => DEFAULT_RUBY
   },
   {
-    :name  => 'passenger_python',
-    :type  => :string
+    :name     => 'passenger_python',
+    :scope    => :application,
+    :type     => :string,
+    :default  => DEFAULT_PYTHON
   },
   {
-    :name  => 'passenger_nodejs',
-    :type  => :string
+    :name     => 'passenger_nodejs',
+    :scope    => :application,
+    :type     => :string,
+    :default  => DEFAULT_NODEJS
   },
   {
-    :name  => 'passenger_meteor_app_settings',
-    :type  => :string
+    :name     => 'passenger_meteor_app_settings',
+    :scope    => :application,
+    :type     => :string
   },
   {
-    :name  => 'passenger_app_env',
-    :type  => :string,
-    :field => 'environment'
+    :name     => 'passenger_app_env',
+    :scope    => :application,
+    :type     => :string,
+    :default  => 'production',
+    :field    => 'environment'
   },
   {
-    :name  => 'passenger_friendly_error_pages',
-    :type  => :flag
+    :name     => 'passenger_friendly_error_pages',
+    :scope    => :application,
+    :type     => :flag,
+    :dynamic_default => 'On if passenger_app_env is development, off otherwise'
   },
   {
-    :name   => 'passenger_min_instances',
-    :type   => :integer,
-    :header => 'PASSENGER_MIN_PROCESSES'
+    :name     => 'passenger_min_instances',
+    :scope    => :application,
+    :type     => :uinteger,
+    :default  => 1,
+    :header   => 'PASSENGER_MIN_PROCESSES'
   },
   {
     :name     => 'passenger_max_instances_per_app',
+    :scope    => :global,
     :context  => [:main],
-    :type     => :integer,
+    :type     => :uinteger,
+    :default  => 0,
     :header   => 'PASSENGER_MAX_PROCESSES'
   },
   {
-    :name  => 'passenger_max_requests',
-    :type  => :integer
-  },
-  {
-    :name  => 'passenger_start_timeout',
-    :type  => :integer
-  },
-  {
-    :name   => 'passenger_base_uri',
-    :type   => :string_array,
-    :field  => 'base_uris',
-    :header => nil
+    :name     => 'passenger_max_requests',
+    :scope    => :location,
+    :type     => :uinteger,
+    :default  => 0
   },
   {
-    :name   => 'passenger_document_root',
-    :type   => :string,
-    :header => nil
+    :name     => 'passenger_start_timeout',
+    :scope    => :application,
+    :type     => :integer,
+    :default  => DEFAULT_START_TIMEOUT / 1000
   },
   {
-    :name  => 'passenger_user',
-    :type  => :string
+    :name     => 'passenger_base_uri',
+    :scope    => :location,
+    :type     => :string_array,
+    :field    => 'base_uris',
+    :header   => nil
   },
   {
-    :name  => 'passenger_group',
-    :type  => :string
+    :name     => 'passenger_document_root',
+    :scope    => :location,
+    :type     => :string,
+    :header   => nil
   },
   {
-    :name  => 'passenger_app_group_name',
-    :type  => :string
+    :name     => 'passenger_user',
+    :scope    => :application,
+    :type     => :string,
+    :dynamic_default => 'See the user account sandboxing rules'
   },
   {
-    :name  => 'passenger_app_root',
-    :type  => :string
+    :name     => 'passenger_group',
+    :scope    => :application,
+    :type     => :string,
+    :dynamic_default => 'See the user account sandboxing rules'
   },
   {
-    :name => 'passenger_app_rights',
-    :type => :string
+    :name     => 'passenger_app_group_name',
+    :scope    => :application,
+    :type     => :string,
+    :dynamic_default => 'passenger_app_root plus passenger_app_env'
   },
   {
-    :name  => 'union_station_support',
-    :type  => :flag
+    :name     => 'passenger_app_root',
+    :scope    => :application,
+    :type     => :string,
+    :dynamic_default => "Parent directory of the associated Nginx virtual host's root directory"
   },
   {
-    :name     => 'union_station_filter',
-    :take     => 'NGX_CONF_TAKE1',
-    :type     => :string_array,
-    :function => 'union_station_filter',
-    :field    => 'union_station_filters',
-    :header   => nil
+    :name     => 'passenger_app_rights',
+    :scope    => :application,
+    :type     => :string
   },
   {
-    :name  => 'passenger_debugger',
-    :type  => :flag
+    :name     => 'passenger_debugger',
+    :scope    => :application,
+    :type     => :flag,
+    :default  => false
   },
   {
-    :name  => 'passenger_max_preloader_idle_time',
-    :type  => :integer
+    :name     => 'passenger_max_preloader_idle_time',
+    :scope    => :application,
+    :type     => :integer,
+    :default  => DEFAULT_MAX_PRELOADER_IDLE_TIME
   },
   {
     :name     => 'passenger_ignore_headers',
+    :scope    => :location,
     :take     => 'NGX_CONF_1MORE',
     :function => 'ngx_conf_set_bitmask_slot',
     :field    => 'upstream_config.ignore_headers',
-    :post     => '&ngx_http_upstream_ignore_headers_masks'
+    :post     => '&ngx_http_upstream_ignore_headers_masks',
+    :auto_generate_nginx_tracking_code => false
   },
   {
-    :name   => 'passenger_env_var',
-    :type   => :string_keyval,
-    :field  => 'env_vars',
-    :header => nil
+    :name     => 'passenger_env_var',
+    :scope    => :application,
+    :type     => :string_keyval,
+    :field    => 'env_vars',
+    :header   => nil
   },
   {
-    :name   => 'passenger_set_header',
-    :type   => :string_keyval,
-    :field  => 'headers_source',
-    :header => nil,
+    :name     => 'passenger_set_header',
+    :scope    => :location,
+    :type     => :string_keyval,
+    :field    => 'headers_source',
+    :header   => nil,
     :auto_generate_nginx_create_code => false,
     :auto_generate_nginx_merge_code  => false
   },
   {
-    :name  => 'passenger_pass_header',
-    :type  => :string_array,
-    :field => 'upstream_config.pass_headers'
+    :name     => 'passenger_pass_header',
+    :scope    => :location,
+    :type     => :string_array,
+    :field    => 'upstream_config.pass_headers'
+  },
+  {
+    :name     => 'passenger_headers_hash_max_size',
+    :scope    => :location,
+    :type     => :uinteger,
+    :header   => nil,
+    :default  => 512
   },
   {
-    :name    => 'passenger_headers_hash_max_size',
-    :type    => :uinteger,
-    :header  => nil,
-    :default => 512
+    :name     => 'passenger_headers_hash_bucket_size',
+    :scope    => :location,
+    :type     => :uinteger,
+    :header   => nil,
+    :default  => 64
   },
   {
-    :name    => 'passenger_headers_hash_bucket_size',
-    :type    => :uinteger,
-    :header  => nil,
-    :default => 64
+    :name     => 'passenger_ignore_client_abort',
+    :scope    => :location,
+    :type     => :flag,
+    :default  => false,
+    :field    => 'upstream_config.ignore_client_abort'
   },
   {
-    :name  => 'passenger_ignore_client_abort',
-    :type  => :flag,
-    :field => 'upstream_config.ignore_client_abort'
+    :name     => 'passenger_read_timeout',
+    :scope    => :location,
+    :type     => :msec,
+    :field    => 'upstream_config.read_timeout'
   },
   {
-    :name  => 'passenger_buffer_response',
-    :type  => :flag,
-    :field => 'upstream_config.buffering'
+    :name     => 'passenger_buffer_response',
+    :scope    => :location,
+    :type     => :flag,
+    :default  => false,
+    :field    => 'upstream_config.buffering'
   },
   {
     :name     => 'passenger_buffer_size',
+    :scope    => :location,
+    :dynamic_default => '4k|8k',
     :take     => 'NGX_CONF_TAKE1',
     :function => 'ngx_conf_set_size_slot',
-    :field    => 'upstream_config.buffer_size'
+    :field    => 'upstream_config.buffer_size',
+    :auto_generate_nginx_tracking_code => false
   },
   {
     :name     => 'passenger_buffers',
+    :scope    => :location,
+    :dynamic_default => '8 4k|8k',
     :take     => 'NGX_CONF_TAKE2',
     :function => 'ngx_conf_set_bufs_slot',
-    :field    => 'upstream_config.bufs'
+    :field    => 'upstream_config.bufs',
+    :auto_generate_nginx_tracking_code => false
   },
   {
     :name     => 'passenger_busy_buffers_size',
+    :scope    => :location,
+    :dynamic_default => '8k|16k',
     :take     => 'NGX_CONF_TAKE1',
     :function => 'ngx_conf_set_size_slot',
-    :field    => 'upstream_config.busy_buffers_size_conf'
+    :field    => 'upstream_config.busy_buffers_size_conf',
+    :auto_generate_nginx_tracking_code => false
   },
   {
     :name     => 'passenger_intercept_errors',
+    :scope    => :location,
     :type     => :flag,
+    :default  => false,
     :field    => 'upstream_config.intercept_errors'
   },
   {
-    :name  => 'passenger_spawn_method',
-    :type  => :string
-  },
-  {
-    :name  => 'passenger_load_shell_envvars',
-    :type  => :flag
+    :name     => 'passenger_spawn_method',
+    :scope    => :application,
+    :dynamic_default => "'smart' for Ruby apps, 'direct' for all other apps",
+    :type     => :string
   },
   {
-    :name  => 'union_station_key',
-    :type  => :string
+    :name     => 'passenger_load_shell_envvars',
+    :scope    => :application,
+    :type     => :flag,
+    :default  => true
   },
   {
-    :name  => 'passenger_max_request_queue_size',
-    :type  => :integer
+    :name     => 'passenger_max_request_queue_size',
+    :scope    => :application,
+    :type     => :uinteger,
+    :default  => DEFAULT_MAX_REQUEST_QUEUE_SIZE
   },
   {
-    :name  => 'passenger_request_queue_overflow_status_code',
-    :type  => :integer
+    :name     => 'passenger_request_queue_overflow_status_code',
+    :scope    => :location,
+    :type     => :integer,
+    :default  => 503
   },
   {
-    :name  => 'passenger_restart_dir',
-    :type  => :string
+    :name     => 'passenger_restart_dir',
+    :scope    => :application,
+    :type     => :string,
+    :default  => 'tmp'
   },
   {
-    :name   => 'passenger_app_type',
-    :type   => :string,
-    :header => nil
+    :name     => 'passenger_app_type',
+    :scope    => :application,
+    :type     => :string,
+    :dynamic_default => 'Autodetected',
+    :header   => nil
   },
   {
-    :name   => 'passenger_startup_file',
-    :type   => :string
+    :name     => 'passenger_startup_file',
+    :scope    => :application,
+    :type     => :string,
+    :dynamic_default => 'Autodetected'
   },
   {
-    :name   => 'passenger_sticky_sessions',
-    :type   => :flag
+    :name     => 'passenger_sticky_sessions',
+    :scope    => :location,
+    :type     => :flag,
+    :default  => false
   },
   {
-    :name   => 'passenger_sticky_sessions_cookie_name',
-    :type   => :string
+    :name     => 'passenger_sticky_sessions_cookie_name',
+    :scope    => :location,
+    :type     => :string,
+    :default  => DEFAULT_STICKY_SESSIONS_COOKIE_NAME
   },
   {
-    :name   => 'passenger_vary_turbocache_by_cookie',
-    :type   => :string
+    :name     => 'passenger_vary_turbocache_by_cookie',
+    :scope    => :location,
+    :type     => :string
   },
   {
-    :name   => 'passenger_abort_websockets_on_process_shutdown',
-    :type   => :flag
+    :name     => 'passenger_abort_websockets_on_process_shutdown',
+    :scope    => :application,
+    :type     => :flag,
+    :default  => true
   },
   {
-    :name   => 'passenger_force_max_concurrent_requests_per_process',
-    :type   => :integer
+    :name     => 'passenger_force_max_concurrent_requests_per_process',
+    :scope    => :application,
+    :type     => :integer,
+    :default  => -1
   },
 
-  ###### Enterprise features ######
+  ###### Enterprise features (placeholders in OSS) ######
   {
     :context  => [:main],
     :name     => 'passenger_fly_with',
+    :scope    => :global,
     :type     => :string,
     :struct   => "NGX_HTTP_MAIN_CONF_OFFSET",
     :function => 'passenger_enterprise_only',
@@ -353,48 +595,66 @@ LOCATION_CONFIGURATION_OPTIONS = [
   },
   {
     :name     => 'passenger_max_instances',
-    :type     => :integer,
-    :function => 'passenger_enterprise_only',
-    :field    => nil
-  },
-  {
-    :name     => 'passenger_max_request_time',
+    :scope    => :application,
     :type     => :integer,
     :function => 'passenger_enterprise_only',
     :field    => nil
   },
   {
     :name     => 'passenger_memory_limit',
+    :scope    => :application,
     :type     => :integer,
     :function => 'passenger_enterprise_only',
     :field    => nil
   },
   {
     :name     => 'passenger_concurrency_model',
+    :scope    => :application,
     :type     => :string,
     :function => 'passenger_enterprise_only',
     :field    => nil
   },
   {
     :name     => 'passenger_thread_count',
+    :scope    => :application,
     :type     => :integer,
     :function => 'passenger_enterprise_only',
     :field    => nil
   },
   {
     :name     => 'passenger_rolling_restarts',
+    :scope    => :application,
     :type     => :flag,
     :function => 'passenger_enterprise_only',
     :field    => nil
   },
   {
     :name     => 'passenger_resist_deployment_errors',
+    :scope    => :application,
     :type     => :flag,
     :function => 'passenger_enterprise_only',
     :field    => nil
   },
+  {
+    :name     => 'passenger_max_request_time',
+    :scope    => :location,
+    :type     => :integer,
+    :function => 'passenger_enterprise_only',
+    :field    => nil
+  },
+  {
+    :name     => 'passenger_max_request_queue_time',
+    :scope    => :location,
+    :type     => :integer,
+    :function => 'passenger_enterprise_only',
+    :field    => nil
+  },
 
   ###### Aliases for backwards compatibility ######
+  {
+    :name      => 'passenger_debug_log_file',
+    :alias_for => 'passenger_log_file'
+  },
   {
     :name      => 'rails_spawn_method',
     :alias_for => 'passenger_spawn_method'
@@ -415,14 +675,86 @@ LOCATION_CONFIGURATION_OPTIONS = [
   ###### Obsolete options ######
   {
     :name     => 'rails_framework_spawner_idle_time',
+    :scope    => :application,
     :take     => 'NGX_CONF_TAKE1',
     :function => 'rails_framework_spawner_idle_time',
     :field    => nil
   },
   {
     :name     => 'passenger_use_global_queue',
+    :scope    => :global,
     :take     => 'NGX_CONF_FLAG',
     :function => 'passenger_use_global_queue',
     :field    => nil
-  }
+  },
+  {
+    :name     => 'passenger_analytics_log_user',
+    :scope    => :global,
+    :context  => [:main],
+    :type     => :string,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'passenger_analytics_log_group',
+    :scope    => :global,
+    :context  => [:main],
+    :type     => :string,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'union_station_gateway_address',
+    :scope    => :global,
+    :context  => [:main],
+    :type     => :string,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'union_station_gateway_port',
+    :scope    => :global,
+    :context  => [:main],
+    :type     => :integer,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'union_station_gateway_cert',
+    :scope    => :global,
+    :context  => [:main],
+    :type     => :string,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'union_station_proxy_address',
+    :scope    => :global,
+    :context  => [:main],
+    :type     => :string,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'union_station_key',
+    :scope    => :application,
+    :type     => :string,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'union_station_support',
+    :scope    => :application,
+    :type     => :flag,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
+  {
+    :name     => 'union_station_filter',
+    :scope    => :application,
+    :take     => 'NGX_CONF_TAKE1',
+    :type     => :string_array,
+    :function => 'passenger_obsolete_directive',
+    :field    => nil
+  },
 ]