passenger 5.2.1 → 5.2.2

data/src/nginx_module/ContentHandler.c

@@ -507,6 +507,8 @@ construct_request_buffer(ngx_http_request_t *r, passenger_loc_conf_t *slcf,
     ngx_table_elt_t *header;
     size_t           len;
     ngx_str_t        public_dir_parent;
+    ngx_str_t        public_dir_resolved;
+    const char      *temp_path;
     ngx_http_script_len_code_pt lcode;
     ngx_http_script_code_pt     code;
     ngx_http_script_engine_t    e, le;
@@ -682,10 +684,46 @@ construct_request_buffer(ngx_http_request_t *r, passenger_loc_conf_t *slcf,
     if (slcf->autogenerated.app_group_name.data == NULL) {
         PUSH_STATIC_STR("!~PASSENGER_APP_GROUP_NAME: ");
         if (slcf->autogenerated.app_root.data == NULL) {
-            public_dir_parent.data = (u_char *) psg_extract_dir_name_static(
-                (const char *) context->public_dir.data,
-                context->public_dir.len,
-                &public_dir_parent.len);
+            if (context->base_uri.data == NULL) {
+                /* If no passenger_base_uri applies, then the app
+                 * group name is based on the parent directory of
+                 * the document root.
+                 */
+                public_dir_parent.data = (u_char *) psg_extract_dir_name_static(
+                    (const char *) context->public_dir.data,
+                    context->public_dir.len,
+                    &public_dir_parent.len);
+            } else {
+                /* If a passenger_base_uri applies, then the document
+                 * root may be a symlink. We base the app group name
+                 * on `extractDirName(resolveSymlink(public_dir))`.
+                 */
+                public_dir_resolved.data = (u_char *)
+                    psg_resolve_symlink((const char *) context->public_dir.data,
+                        context->public_dir.len, &public_dir_resolved.len);
+                if (public_dir_resolved.data == NULL) {
+                    /* Resolve or memory allocation error. Fallback to
+                     * assuming that no passenger_base_uri applies.
+                     */
+                    ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno,
+                        "error resolving symlink %V",
+                        &context->public_dir);
+                    public_dir_parent.data = (u_char *) psg_extract_dir_name_static(
+                        (const char *) context->public_dir.data,
+                        context->public_dir.len,
+                        &public_dir_parent.len);
+                } else {
+                    temp_path = psg_extract_dir_name_static(
+                        (const char *) public_dir_resolved.data,
+                        public_dir_resolved.len,
+                        &public_dir_parent.len);
+                    public_dir_parent.data = ngx_pnalloc(r->pool,
+                        public_dir_parent.len);
+                    memcpy(public_dir_parent.data, temp_path,
+                        public_dir_parent.len);
+                    free(public_dir_resolved.data);
+                }
+            }
             if (b != NULL) {
                 b->last = ngx_copy(b->last, public_dir_parent.data,
                     public_dir_parent.len);

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -66,6 +66,7 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->group.len  = 0;
     conf->app_group_name.data = NULL;
     conf->app_group_name.len  = 0;
+    conf->monitor_log_file = NGX_CONF_UNSET_PTR;
     conf->app_root.data = NULL;
     conf->app_root.len  = 0;
     conf->app_rights.data = NULL;
@@ -162,6 +163,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->app_group_name_source_file.len = 0;
     conf->app_group_name_source_line = 0;
     conf->app_group_name_explicitly_set = 0;
+    conf->monitor_log_file_source_file.data = NULL;
+    conf->monitor_log_file_source_file.len = 0;
+    conf->monitor_log_file_source_line = 0;
+    conf->monitor_log_file_explicitly_set = 0;
     conf->app_root_source_file.data = NULL;
     conf->app_root_source_file.len = 0;
     conf->app_root_source_line = 0;

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -250,6 +250,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
             (const char *) plcf->autogenerated.app_group_name.data,
             plcf->autogenerated.app_group_name.len);
     }
+    if (plcf->autogenerated.monitor_log_file_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_monitor_log_file",
+            sizeof("passenger_monitor_log_file") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.monitor_log_file_source_file,
+            plcf->autogenerated.monitor_log_file_source_line);
+        psg_json_value_set_str_array(hierarchy_member, "value",
+            plcf->autogenerated.monitor_log_file);
+    }
     if (plcf->autogenerated.app_root_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -96,6 +96,11 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_str_value(conf->app_group_name,
         prev->app_group_name,
         NULL);
+    if (merge_string_array(cf, &prev->monitor_log_file, &conf->monitor_log_file) != NGX_OK) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+            "cannot merge \"passenger_monitor_log_file\" configurations");
+        return 0;
+    }
     ngx_conf_merge_str_value(conf->app_root,
         prev->app_root,
         NULL);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -56,6 +56,7 @@ typedef struct {
     ngx_uint_t max_request_queue_size;
     ngx_uint_t max_requests;
     ngx_uint_t min_instances;
+    ngx_array_t *monitor_log_file;
     ngx_int_t request_queue_overflow_status_code;
     ngx_int_t start_timeout;
     ngx_flag_t sticky_sessions;
@@ -102,6 +103,7 @@ typedef struct {
     ngx_str_t max_requests_source_file;
     ngx_str_t meteor_app_settings_source_file;
     ngx_str_t min_instances_source_file;
+    ngx_str_t monitor_log_file_source_file;
     ngx_str_t nodejs_source_file;
     ngx_str_t python_source_file;
     ngx_str_t request_queue_overflow_status_code_source_file;
@@ -149,6 +151,7 @@ typedef struct {
     ngx_uint_t max_requests_source_line;
     ngx_uint_t meteor_app_settings_source_line;
     ngx_uint_t min_instances_source_line;
+    ngx_uint_t monitor_log_file_source_line;
     ngx_uint_t nodejs_source_line;
     ngx_uint_t python_source_line;
     ngx_uint_t request_queue_overflow_status_code_source_line;
@@ -196,6 +199,7 @@ typedef struct {
     ngx_int_t max_requests_explicitly_set;
     ngx_int_t meteor_app_settings_explicitly_set;
     ngx_int_t min_instances_explicitly_set;
+    ngx_int_t monitor_log_file_explicitly_set;
     ngx_int_t nodejs_explicitly_set;
     ngx_int_t python_explicitly_set;
     ngx_int_t request_queue_overflow_status_code_explicitly_set;

data/src/nginx_module/MainConfig/AutoGeneratedCreateFunction.c

@@ -44,6 +44,8 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->root_dir.len  = 0;
     conf->ctl = NULL;
     conf->abort_on_startup_error = NGX_CONF_UNSET;
+    conf->dump_config_manifest.data = NULL;
+    conf->dump_config_manifest.len  = 0;
     conf->log_level = NGX_CONF_UNSET_UINT;
     conf->log_file.data = NULL;
     conf->log_file.len  = 0;
@@ -70,6 +72,14 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->response_buffer_high_watermark = NGX_CONF_UNSET_UINT;
     conf->stat_throttle_rate = NGX_CONF_UNSET_UINT;
     conf->show_version_in_header = NGX_CONF_UNSET;
+    conf->admin_panel_url.data = NULL;
+    conf->admin_panel_url.len  = 0;
+    conf->admin_panel_auth_type.data = NULL;
+    conf->admin_panel_auth_type.len  = 0;
+    conf->admin_panel_username.data = NULL;
+    conf->admin_panel_username.len  = 0;
+    conf->admin_panel_password.data = NULL;
+    conf->admin_panel_password.len  = 0;
 
     conf->root_dir_source_file.data = NULL;
     conf->root_dir_source_file.len = 0;
@@ -83,6 +93,10 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->abort_on_startup_error_source_file.len = 0;
     conf->abort_on_startup_error_source_line = 0;
     conf->abort_on_startup_error_explicitly_set = 0;
+    conf->dump_config_manifest_source_file.data = NULL;
+    conf->dump_config_manifest_source_file.len = 0;
+    conf->dump_config_manifest_source_line = 0;
+    conf->dump_config_manifest_explicitly_set = 0;
     conf->log_level_source_file.data = NULL;
     conf->log_level_source_file.len = 0;
     conf->log_level_source_line = 0;
@@ -159,5 +173,21 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->show_version_in_header_source_file.len = 0;
     conf->show_version_in_header_source_line = 0;
     conf->show_version_in_header_explicitly_set = 0;
+    conf->admin_panel_url_source_file.data = NULL;
+    conf->admin_panel_url_source_file.len = 0;
+    conf->admin_panel_url_source_line = 0;
+    conf->admin_panel_url_explicitly_set = 0;
+    conf->admin_panel_auth_type_source_file.data = NULL;
+    conf->admin_panel_auth_type_source_file.len = 0;
+    conf->admin_panel_auth_type_source_line = 0;
+    conf->admin_panel_auth_type_explicitly_set = 0;
+    conf->admin_panel_username_source_file.data = NULL;
+    conf->admin_panel_username_source_file.len = 0;
+    conf->admin_panel_username_source_line = 0;
+    conf->admin_panel_username_explicitly_set = 0;
+    conf->admin_panel_password_source_file.data = NULL;
+    conf->admin_panel_password_source_file.len = 0;
+    conf->admin_panel_password_source_line = 0;
+    conf->admin_panel_password_explicitly_set = 0;
 }
 

data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c

@@ -78,6 +78,18 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
         psg_json_value_set_bool(hierarchy_member, "value",
             conf->autogenerated.abort_on_startup_error);
     }
+    if (conf->autogenerated.dump_config_manifest_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_dump_config_manifest",
+            sizeof("passenger_dump_config_manifest") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.dump_config_manifest_source_file,
+            conf->autogenerated.dump_config_manifest_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.dump_config_manifest.data,
+            conf->autogenerated.dump_config_manifest.len);
+    }
     if (conf->autogenerated.log_level_explicitly_set) {
         option_container = find_or_create_manifest_option_container(ctx,
             ctx->global_config_container,
@@ -294,6 +306,54 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
         psg_json_value_set_bool(hierarchy_member, "value",
             conf->autogenerated.show_version_in_header);
     }
+    if (conf->autogenerated.admin_panel_url_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_admin_panel_url",
+            sizeof("passenger_admin_panel_url") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.admin_panel_url_source_file,
+            conf->autogenerated.admin_panel_url_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.admin_panel_url.data,
+            conf->autogenerated.admin_panel_url.len);
+    }
+    if (conf->autogenerated.admin_panel_auth_type_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_admin_panel_auth_type",
+            sizeof("passenger_admin_panel_auth_type") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.admin_panel_auth_type_source_file,
+            conf->autogenerated.admin_panel_auth_type_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.admin_panel_auth_type.data,
+            conf->autogenerated.admin_panel_auth_type.len);
+    }
+    if (conf->autogenerated.admin_panel_username_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_admin_panel_username",
+            sizeof("passenger_admin_panel_username") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.admin_panel_username_source_file,
+            conf->autogenerated.admin_panel_username_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.admin_panel_username.data,
+            conf->autogenerated.admin_panel_username.len);
+    }
+    if (conf->autogenerated.admin_panel_password_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_admin_panel_password",
+            sizeof("passenger_admin_panel_password") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.admin_panel_password_source_file,
+            conf->autogenerated.admin_panel_password_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.admin_panel_password.data,
+            conf->autogenerated.admin_panel_password.len);
+    }
 
     /*
      * No autogenerated code for:

data/src/nginx_module/MainConfig/AutoGeneratedStruct.h

@@ -53,9 +53,14 @@ typedef struct {
     ngx_uint_t stat_throttle_rate;
     ngx_flag_t turbocaching;
     ngx_flag_t user_switching;
+    ngx_str_t admin_panel_auth_type;
+    ngx_str_t admin_panel_password;
+    ngx_str_t admin_panel_url;
+    ngx_str_t admin_panel_username;
     ngx_str_t data_buffer_dir;
     ngx_str_t default_group;
     ngx_str_t default_user;
+    ngx_str_t dump_config_manifest;
     ngx_str_t file_descriptor_log_file;
     ngx_str_t instance_registry_dir;
     ngx_str_t log_file;
@@ -63,12 +68,17 @@ typedef struct {
     ngx_str_t security_update_check_proxy;
 
     ngx_str_t abort_on_startup_error_source_file;
+    ngx_str_t admin_panel_auth_type_source_file;
+    ngx_str_t admin_panel_password_source_file;
+    ngx_str_t admin_panel_url_source_file;
+    ngx_str_t admin_panel_username_source_file;
     ngx_str_t core_file_descriptor_ulimit_source_file;
     ngx_str_t ctl_source_file;
     ngx_str_t data_buffer_dir_source_file;
     ngx_str_t default_group_source_file;
     ngx_str_t default_user_source_file;
     ngx_str_t disable_security_update_check_source_file;
+    ngx_str_t dump_config_manifest_source_file;
     ngx_str_t file_descriptor_log_file_source_file;
     ngx_str_t instance_registry_dir_source_file;
     ngx_str_t log_file_source_file;
@@ -86,12 +96,17 @@ typedef struct {
     ngx_str_t user_switching_source_file;
 
     ngx_uint_t abort_on_startup_error_source_line;
+    ngx_uint_t admin_panel_auth_type_source_line;
+    ngx_uint_t admin_panel_password_source_line;
+    ngx_uint_t admin_panel_url_source_line;
+    ngx_uint_t admin_panel_username_source_line;
     ngx_uint_t core_file_descriptor_ulimit_source_line;
     ngx_uint_t ctl_source_line;
     ngx_uint_t data_buffer_dir_source_line;
     ngx_uint_t default_group_source_line;
     ngx_uint_t default_user_source_line;
     ngx_uint_t disable_security_update_check_source_line;
+    ngx_uint_t dump_config_manifest_source_line;
     ngx_uint_t file_descriptor_log_file_source_line;
     ngx_uint_t instance_registry_dir_source_line;
     ngx_uint_t log_file_source_line;
@@ -109,12 +124,17 @@ typedef struct {
     ngx_uint_t user_switching_source_line;
 
     ngx_int_t abort_on_startup_error_explicitly_set;
+    ngx_int_t admin_panel_auth_type_explicitly_set;
+    ngx_int_t admin_panel_password_explicitly_set;
+    ngx_int_t admin_panel_url_explicitly_set;
+    ngx_int_t admin_panel_username_explicitly_set;
     ngx_int_t core_file_descriptor_ulimit_explicitly_set;
     ngx_int_t ctl_explicitly_set;
     ngx_int_t data_buffer_dir_explicitly_set;
     ngx_int_t default_group_explicitly_set;
     ngx_int_t default_user_explicitly_set;
     ngx_int_t disable_security_update_check_explicitly_set;
+    ngx_int_t dump_config_manifest_explicitly_set;
     ngx_int_t file_descriptor_log_file_explicitly_set;
     ngx_int_t instance_registry_dir_explicitly_set;
     ngx_int_t log_file_explicitly_set;

data/src/nginx_module/ngx_http_passenger_module.c

@@ -374,6 +374,10 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_json_value_set_ngx_uint  (w_config, "pool_idle_time", autogenerated_main_conf->pool_idle_time);
     psg_json_value_set_ngx_uint  (w_config, "response_buffer_high_watermark", autogenerated_main_conf->response_buffer_high_watermark);
     psg_json_value_set_ngx_uint  (w_config, "stat_throttle_rate", autogenerated_main_conf->stat_throttle_rate);
+    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_url", &autogenerated_main_conf->admin_panel_url);
+    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_auth_type", &autogenerated_main_conf->admin_panel_auth_type);
+    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_username", &autogenerated_main_conf->admin_panel_username);
+    psg_json_value_set_ngx_str_ne(w_config, "admin_panel_password", &autogenerated_main_conf->admin_panel_password);
 
     if (autogenerated_main_conf->prestart_uris != NGX_CONF_UNSET_PTR) {
         psg_json_value_set_strset(w_config, "prestart_urls", (ngx_str_t *) autogenerated_main_conf->prestart_uris->elts,

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '5.2.1'
+  VERSION_STRING = '5.2.2'
 
   PREFERRED_NGINX_VERSION = '1.12.2'
   NGINX_SHA256_CHECKSUM = '305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416'

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

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2017 Phusion Holding B.V.
+#  Copyright (c) 2014-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -107,6 +107,12 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :function  => 'cmd_passenger_ctl',
     :desc      => "Set advanced #{PROGRAM_NAME} options."
   },
+  {
+    :name      => 'PassengerDumpConfigManifest',
+    :type      => :string,
+    :context   => :global,
+    :desc      => "Dump the #{SHORT_PROGRAM_NAME} config manifest to the given file, for debugging purposes."
+  },
   {
     :name      => 'PassengerDefaultRuby',
     :type      => :string,
@@ -260,6 +266,30 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :header    => 'PASSENGER_MAX_PROCESSES',
     :desc      => 'The maximum number of simultaneously alive application instances a single application may occupy.'
   },
+  {
+    :name      => 'PassengerAdminPanelUrl',
+    :type      => :string,
+    :context   => :global,
+    :desc      => 'Connect to an admin panel at the given connector URL'
+  },
+  {
+    :name      => 'PassengerAdminPanelAuthType',
+    :type      => :string,
+    :context   => :global,
+    :desc      => 'The authentication type to use when connecting to the admin panel'
+  },
+  {
+    :name      => 'PassengerAdminPanelUsername',
+    :type      => :string,
+    :context   => :global,
+    :desc      => 'The username to use when connecting to the admin panel using basic authentication'
+  },
+  {
+    :name      => 'PassengerAdminPanelPassword',
+    :type      => :string,
+    :context   => :global,
+    :desc      => 'The password to use when connecting to the admin panel using basic authentication'
+  },
 
   ###### Per-application configuration ######
 
@@ -399,6 +429,12 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :dynamic_default => 'PassengerAppRoot plus PassengerAppEnv',
     :desc      => 'Application process group name.'
   },
+  {
+    :name      => 'PassengerMonitorLogFile',
+    :type      => :string_set,
+    :header    => nil,
+    :desc      => 'Log file path to monitor.'
+  },
   {
     :name      => 'PassengerForceMaxConcurrentRequestsPerProcess',
     :type      => :integer,

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -86,6 +86,7 @@ module PhusionPassenger
     # but there's no real average upload size anyway so we choose mem safety instead.
     DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD = 1024 * 128
     SERVER_KIT_MAX_SERVER_ENDPOINTS = 4
+    LOG_MONITORING_MAX_LINES = 200
 
     # Time limits
     PROCESS_SHUTDOWN_TIMEOUT = 60 # In seconds

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

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2017 Phusion Holding B.V.
+#  Copyright (c) 2013-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -129,6 +129,13 @@ NGINX_CONFIGURATION_OPTIONS = [
     :context  => [:main],
     :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
+  {
+    :name     => 'passenger_dump_config_manifest',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
   {
     :name     => 'passenger_log_level',
     :scope    => :global,
@@ -285,6 +292,34 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :uinteger,
     :dynamic_default => 'passenger_core_file_descriptor_ulimit'
   },
+  {
+    :name     => 'passenger_admin_panel_url',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_admin_panel_auth_type',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_admin_panel_username',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_admin_panel_password',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
   {
     :name     => 'passenger_enabled',
     :scope    => :location,
@@ -388,6 +423,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :dynamic_default => 'passenger_app_root plus passenger_app_env'
   },
+  {
+    :name     => 'passenger_monitor_log_file',
+    :scope    => :application,
+    :type     => :string_array,
+    :header   => nil
+  },
   {
     :name     => 'passenger_app_root',
     :scope    => :application,