passenger 5.1.12 → 5.2.0

data/src/nginx_module/ConfigGeneral/ManifestGeneration.h

@@ -0,0 +1,100 @@
+#ifndef _PASSENGER_NGINX_MODULE_CONFIG_GENERAL_MANIFEST_GENERATION_H_
+#define _PASSENGER_NGINX_MODULE_CONFIG_GENERAL_MANIFEST_GENERATION_H_
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
+#include "cxx_supportlib/JsonTools/CBindings.h"
+
+#ifndef _PASSENGER_NGINX_MODULE_CONF_STRUCT_TYPEDEFS_H_
+    #define _PASSENGER_NGINX_MODULE_CONF_STRUCT_TYPEDEFS_H_
+    struct passenger_main_conf_s;
+    struct passenger_loc_conf_s;
+    typedef struct passenger_main_conf_s passenger_main_conf_t;
+    typedef struct passenger_loc_conf_s passenger_loc_conf_t;
+#endif /* _PASSENGER_NGINX_MODULE_CONF_STRUCT_TYPEDEFS_H_ */
+
+typedef struct {
+    ngx_conf_t *cf;
+
+    PsgJsonValue *manifest;
+    PsgJsonValue *global_config_container;
+    PsgJsonValue *default_app_config_container;
+    PsgJsonValue *default_loc_config_container;
+    PsgJsonValue *app_configs_container;
+
+    PsgJsonValue *empty_object, *empty_array;
+
+    PsgJsonValueIterator *it, *end;
+    PsgJsonValueIterator *it2, *end2;
+    PsgJsonValueIterator *it3, *end3;
+    PsgJsonValueIterator *it4, *end4;
+} manifest_gen_ctx_t;
+
+static PsgJsonValue *generate_config_manifest(ngx_conf_t *cf, passenger_loc_conf_t *toplevel_plcf);
+
+static void init_config_manifest_generation(ngx_conf_t *cf, manifest_gen_ctx_t *ctx);
+static void deinit_config_manifest_generation(manifest_gen_ctx_t *ctx);
+
+static void recursively_generate_config_manifest_for_loc_conf(manifest_gen_ctx_t *ctx,
+	passenger_loc_conf_t *plcf);
+static int infer_loc_conf_app_group_name(manifest_gen_ctx_t *ctx,
+	passenger_loc_conf_t *plcf, ngx_http_core_loc_conf_t *clcf, ngx_str_t *result);
+static void generate_config_manifest_for_loc_conf(manifest_gen_ctx_t *ctx,
+	passenger_loc_conf_t *plcf, ngx_http_core_srv_conf_t *cscf,
+	ngx_http_core_loc_conf_t *clcf);
+static void find_or_create_manifest_app_and_loc_options_containers(manifest_gen_ctx_t *ctx,
+    passenger_loc_conf_t *plcf, ngx_http_core_srv_conf_t *cscf,
+    ngx_http_core_loc_conf_t *clcf, PsgJsonValue **app_options_container,
+    PsgJsonValue **loc_options_container);
+static PsgJsonValue *find_manifest_loc_config_container(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *loc_configs_container, ngx_http_core_srv_conf_t *cscf,
+    ngx_http_core_loc_conf_t *clcf);
+static PsgJsonValue *create_manifest_loc_config_container(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *loc_configs_container, ngx_http_core_srv_conf_t *cscf,
+    ngx_http_core_loc_conf_t *clcf);
+static void init_manifest_option_container(manifest_gen_ctx_t *ctx, PsgJsonValue *doc);
+static PsgJsonValue *find_or_create_manifest_option_container(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name,
+    size_t option_name_len);
+static PsgJsonValue *add_manifest_option_container_hierarchy_member(
+    PsgJsonValue *option_container, ngx_str_t *source_file, ngx_uint_t source_line);
+
+static void generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx,
+    passenger_main_conf_t *conf);
+static void generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx,
+    passenger_loc_conf_t *plcf, ngx_http_core_srv_conf_t *cscf,
+    ngx_http_core_loc_conf_t *clcf);
+
+static void reverse_manifest_value_hierarchies(manifest_gen_ctx_t *ctx);
+static void reverse_value_hierarchies_in_options_container(PsgJsonValue *options_container,
+    PsgJsonValueIterator *it, PsgJsonValueIterator *end);
+
+static void add_manifest_options_container_dynamic_default(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
+    const char *desc, size_t desc_len);
+static void add_manifest_options_container_static_default_str(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
+    const char *value, size_t value_len);
+static void add_manifest_options_container_static_default_int(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
+    int value);
+static void add_manifest_options_container_static_default_uint(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
+    unsigned int value);
+static void add_manifest_options_container_static_default_bool(manifest_gen_ctx_t *ctx,
+    PsgJsonValue *options_container, const char *option_name, size_t option_name_len,
+    int value);
+
+static void manifest_inherit_application_value_hierarchies(manifest_gen_ctx_t *ctx);
+static void manifest_inherit_location_value_hierarchies(manifest_gen_ctx_t *ctx);
+static void maybe_inherit_string_array_hierarchy_values(PsgJsonValue *value_hierarchy_doc,
+    PsgJsonValueIterator *it, PsgJsonValueIterator *end);
+static void maybe_inherit_string_keyval_hierarchy_values(PsgJsonValue *value_hierarchy_doc,
+    PsgJsonValueIterator *it, PsgJsonValueIterator *end);
+
+static void psg_json_value_append_vals(PsgJsonValue *doc, PsgJsonValue *doc2,
+    PsgJsonValueIterator *it, PsgJsonValueIterator *end);
+static int json_array_contains(PsgJsonValue *doc, PsgJsonValue *elem);
+
+#endif /* _PASSENGER_NGINX_MODULE_CONFIG_GENERAL_MANIFEST_GENERATION_H_ */

data/src/nginx_module/Configuration.c

@@ -37,8 +37,14 @@
 #include "ngx_http_passenger_module.h"
 #include "Configuration.h"
 #include "ContentHandler.h"
+#include "ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c"
+#include "ConfigGeneral/AutoGeneratedSetterFuncs.c"
+#include "ConfigGeneral/ManifestGeneration.c"
+#include "MainConfig/AutoGeneratedCreateFunction.c"
+#include "MainConfig/AutoGeneratedManifestGeneration.c"
+#include "LocationConfig/AutoGeneratedCreateFunction.c"
+#include "LocationConfig/AutoGeneratedManifestGeneration.c"
 #include "cxx_supportlib/Constants.h"
-#include "cxx_supportlib/UnionStationFilterSupport.h"
 #include "cxx_supportlib/vendor-modified/modp_b64.h"
 
 
@@ -55,31 +61,11 @@ static ngx_str_t headers_to_hide[] = {
 
 passenger_main_conf_t passenger_main_conf;
 
-typedef struct postprocess_ctx_s postprocess_ctx_t;
-
 static ngx_path_init_t  ngx_http_proxy_temp_path = {
     ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
 };
 
-static ngx_int_t postprocess_location_conf(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_core_loc_conf_t *location_conf,
-    int is_toplevel,
-    postprocess_ctx_t *ctx);
-static ngx_int_t traverse_location_confs_nested_in_server_conf(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_core_loc_conf_t *location_conf,
-    postprocess_ctx_t *ctx);
-static ngx_int_t traverse_static_location_tree(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_location_tree_node_t *node,
-    postprocess_ctx_t *ctx);
-#ifdef NGX_PCRE
-static ngx_int_t traverse_regex_locations(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_core_loc_conf_t **regex_locations,
-    postprocess_ctx_t *ctx);
-#endif
+
 static ngx_int_t merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf,
     passenger_loc_conf_t *prev);
 static ngx_int_t merge_string_array(ngx_conf_t *cf, ngx_array_t **prev,
@@ -88,6 +74,10 @@ static ngx_int_t merge_string_keyval_table(ngx_conf_t *cf, ngx_array_t **prev,
     ngx_array_t **conf);
 
 
+#include "LocationConfig/AutoGeneratedMergeFunction.c"
+#include "LocationConfig/AutoGeneratedHeaderSerialization.c"
+
+
 void *
 passenger_create_main_conf(ngx_conf_t *cf)
 {
@@ -98,55 +88,10 @@ passenger_create_main_conf(ngx_conf_t *cf)
         return NGX_CONF_ERROR;
     }
 
-    conf->ctl = ngx_array_create(cf->pool, 1, sizeof(ngx_keyval_t));
-    if (conf->ctl == NULL) {
-        return NGX_CONF_ERROR;
-    }
     conf->default_ruby.data = NULL;
     conf->default_ruby.len = 0;
-    conf->log_level = (ngx_int_t) NGX_CONF_UNSET;
-    conf->log_file.data = NULL;
-    conf->log_file.len = 0;
-    conf->socket_backlog = NGX_CONF_UNSET_UINT;
-    conf->file_descriptor_log_file.data = NULL;
-    conf->file_descriptor_log_file.len = 0;
-    conf->data_buffer_dir.data = NULL;
-    conf->data_buffer_dir.len = 0;
-    conf->instance_registry_dir.data = NULL;
-    conf->instance_registry_dir.len = 0;
-    conf->disable_security_update_check = NGX_CONF_UNSET;
-    conf->security_update_check_proxy.data = NULL;
-    conf->security_update_check_proxy.len = 0;
-    conf->abort_on_startup_error = NGX_CONF_UNSET;
-    conf->max_pool_size = NGX_CONF_UNSET_UINT;
-    conf->pool_idle_time = NGX_CONF_UNSET_UINT;
-    conf->response_buffer_high_watermark = NGX_CONF_UNSET_UINT;
-    conf->stat_throttle_rate = NGX_CONF_UNSET_UINT;
-    conf->core_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
-    conf->user_switching = NGX_CONF_UNSET;
-    conf->show_version_in_header = NGX_CONF_UNSET;
-    conf->turbocaching = NGX_CONF_UNSET;
-    conf->default_user.data = NULL;
-    conf->default_user.len  = 0;
-    conf->default_group.data = NULL;
-    conf->default_group.len  = 0;
-    conf->analytics_log_user.data = NULL;
-    conf->analytics_log_user.len  = 0;
-    conf->analytics_log_group.data = NULL;
-    conf->analytics_log_group.len  = 0;
-    conf->union_station_support = 0;
-    conf->union_station_gateway_address.data = NULL;
-    conf->union_station_gateway_address.len = 0;
-    conf->union_station_gateway_port = (ngx_uint_t) NGX_CONF_UNSET;
-    conf->union_station_gateway_cert.data = NULL;
-    conf->union_station_gateway_cert.len = 0;
-    conf->union_station_proxy_address.data = NULL;
-    conf->union_station_proxy_address.len = 0;
-
-    conf->prestart_uris = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
-    if (conf->prestart_uris == NULL) {
-        return NGX_CONF_ERROR;
-    }
+
+    passenger_create_autogenerated_main_conf(&conf->autogenerated);
 
     return conf;
 }
@@ -162,133 +107,43 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     conf = &passenger_main_conf;
     *conf = *((passenger_main_conf_t *) conf_pointer);
 
-    if (conf->default_ruby.len == 0) {
-        conf->default_ruby.data = (u_char *) DEFAULT_RUBY;
-        conf->default_ruby.len = strlen(DEFAULT_RUBY);
-    }
-
-    if (conf->log_level == (ngx_int_t) NGX_CONF_UNSET) {
-        conf->log_level = DEFAULT_LOG_LEVEL;
-    }
-
-    if (conf->log_file.len == 0) {
-        conf->log_file.data = (u_char *) "";
-    }
-
-    if (conf->file_descriptor_log_file.len == 0) {
-        conf->file_descriptor_log_file.data = (u_char *) "";
-    }
-
-    if (conf->socket_backlog == NGX_CONF_UNSET_UINT) {
-        conf->socket_backlog = DEFAULT_SOCKET_BACKLOG;
-    }
-
-    if (conf->data_buffer_dir.len == 0) {
-        conf->data_buffer_dir.data = (u_char *) "";
+    if (conf->autogenerated.abort_on_startup_error == NGX_CONF_UNSET) {
+        conf->autogenerated.abort_on_startup_error = 0;
     }
 
-    if (conf->instance_registry_dir.len == 0) {
-        conf->instance_registry_dir.data = (u_char *) "";
+    if (conf->autogenerated.show_version_in_header == NGX_CONF_UNSET) {
+        conf->autogenerated.show_version_in_header = 1;
     }
 
-    if (conf->disable_security_update_check == NGX_CONF_UNSET) {
-		conf->disable_security_update_check = 0;
-	}
-
-    if (conf->security_update_check_proxy.len == 0) {
-		conf->security_update_check_proxy.data = (u_char *) "";
-	}
-
-    if (conf->abort_on_startup_error == NGX_CONF_UNSET) {
-        conf->abort_on_startup_error = 0;
-    }
-
-    if (conf->max_pool_size == NGX_CONF_UNSET_UINT) {
-        conf->max_pool_size = DEFAULT_MAX_POOL_SIZE;
-    }
-
-    if (conf->pool_idle_time == NGX_CONF_UNSET_UINT) {
-        conf->pool_idle_time = DEFAULT_POOL_IDLE_TIME;
-    }
-
-    if (conf->response_buffer_high_watermark == NGX_CONF_UNSET_UINT) {
-        conf->response_buffer_high_watermark = DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK;
-    }
-
-    if (conf->stat_throttle_rate == NGX_CONF_UNSET_UINT) {
-        conf->stat_throttle_rate = DEFAULT_STAT_THROTTLE_RATE;
+    if (conf->autogenerated.default_user.len == 0) {
+        conf->autogenerated.default_user.len  = sizeof(DEFAULT_WEB_APP_USER) - 1;
+        conf->autogenerated.default_user.data = (u_char *) DEFAULT_WEB_APP_USER;
     }
-
-    if (conf->user_switching == NGX_CONF_UNSET) {
-        conf->user_switching = 1;
-    }
-
-    if (conf->show_version_in_header == NGX_CONF_UNSET) {
-        conf->show_version_in_header = 1;
-    }
-
-    if (conf->turbocaching == NGX_CONF_UNSET) {
-        conf->turbocaching = 1;
+    if (conf->autogenerated.default_user.len > sizeof(buf) - 1) {
+        return "Value for 'passenger_default_user' is too long.";
     }
-
-    if (conf->default_user.len == 0) {
-        conf->default_user.len  = sizeof(DEFAULT_WEB_APP_USER) - 1;
-        conf->default_user.data = (u_char *) DEFAULT_WEB_APP_USER;
-    }
-    if (conf->default_user.len > sizeof(buf) - 1) {
-        return "Value for 'default_user' is too long.";
-    }
-    memcpy(buf, conf->default_user.data, conf->default_user.len);
-    buf[conf->default_user.len] = '\0';
+    memcpy(buf, conf->autogenerated.default_user.data, conf->autogenerated.default_user.len);
+    buf[conf->autogenerated.default_user.len] = '\0';
     user_entry = getpwnam(buf);
     if (user_entry == NULL) {
-        return "The user specified by the 'default_user' option does not exist.";
+        return "The user specified by the 'passenger_default_user' option does not exist.";
     }
 
-    if (conf->default_group.len > 0) {
-        if (conf->default_group.len > sizeof(buf) - 1) {
-            return "Value for 'default_group' is too long.";
+    if (conf->autogenerated.default_group.len > 0) {
+        if (conf->autogenerated.default_group.len > sizeof(buf) - 1) {
+            return "Value for 'passenger_default_group' is too long.";
         }
-        memcpy(buf, conf->default_group.data, conf->default_group.len);
-        buf[conf->default_group.len] = '\0';
+        memcpy(buf, conf->autogenerated.default_group.data, conf->autogenerated.default_group.len);
+        buf[conf->autogenerated.default_group.len] = '\0';
         group_entry = getgrnam(buf);
         if (group_entry == NULL) {
-            return "The group specified by the 'default_group' option does not exist.";
+            return "The group specified by the 'passenger_default_group' option does not exist.";
         }
     }
 
-    if (conf->analytics_log_user.len == 0) {
-        conf->analytics_log_user.len  = sizeof(DEFAULT_ANALYTICS_LOG_USER) - 1;
-        conf->analytics_log_user.data = (u_char *) DEFAULT_ANALYTICS_LOG_USER;
-    }
-
-    if (conf->analytics_log_group.len == 0) {
-        conf->analytics_log_group.len  = sizeof(DEFAULT_ANALYTICS_LOG_GROUP) - 1;
-        conf->analytics_log_group.data = (u_char *) DEFAULT_ANALYTICS_LOG_GROUP;
-    }
-
-    if (conf->union_station_gateway_address.len == 0) {
-        conf->union_station_gateway_address.len = sizeof(DEFAULT_UNION_STATION_GATEWAY_ADDRESS) - 1;
-        conf->union_station_gateway_address.data = (u_char *) DEFAULT_UNION_STATION_GATEWAY_ADDRESS;
-    }
-
-    if (conf->union_station_gateway_port == (ngx_uint_t) NGX_CONF_UNSET) {
-        conf->union_station_gateway_port = DEFAULT_UNION_STATION_GATEWAY_PORT;
-    }
-
-    if (conf->union_station_gateway_cert.len == 0) {
-        conf->union_station_gateway_cert.data = (u_char *) "";
-    }
-
-    if (conf->union_station_proxy_address.len == 0) {
-        conf->union_station_proxy_address.data = (u_char *) "";
-    }
-
     return NGX_CONF_OK;
 }
 
-#include "CreateLocationConfig.c"
-
 void *
 passenger_create_loc_conf(ngx_conf_t *cf)
 {
@@ -314,7 +169,31 @@ passenger_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream_config.store_values = NULL;
      */
 
-    generated_set_conf_part(conf);
+    conf->parent = NULL;
+    if (ngx_array_init(&conf->children, cf->pool, 8,
+                       sizeof(passenger_loc_conf_t *))
+        != NGX_OK)
+    {
+        return NGX_CONF_ERROR;
+    }
+
+    if (cf->conf_file == NULL) {
+        conf->context_source_file.data = (u_char *) NULL;
+        conf->context_source_file.len = 0;
+        conf->context_source_line = 0;
+    } else if (cf->conf_file->file.fd == NGX_INVALID_FILE) {
+        conf->context_source_file.data = (u_char *) "(command line)";
+        conf->context_source_file.len = sizeof("(command line)") - 1;
+        conf->context_source_line = 0;
+    } else {
+        conf->context_source_file = cf->conf_file->file.name;
+        conf->context_source_line = cf->conf_file->line;
+    }
+
+    conf->cscf = NULL;
+    conf->clcf = NULL;
+
+    passenger_create_autogenerated_loc_conf(&conf->autogenerated);
 
     /******************************/
     /******************************/
@@ -390,21 +269,19 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     return conf;
 }
 
-#include "CacheLocationConfig.c"
-
 static ngx_int_t
-cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
+serialize_loc_conf_to_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf)
 {
     ngx_uint_t     i;
     ngx_keyval_t  *env_vars;
     size_t         unencoded_len;
     u_char        *unencoded_buf;
 
-    if (generated_cache_location_part(cf, conf) == 0) {
+    if (passenger_serialize_autogenerated_loc_conf_to_headers(cf, conf) == 0) {
         return NGX_ERROR;
     }
 
-    if (conf->env_vars != NULL) {
+    if (conf->autogenerated.env_vars != NULL) {
         size_t len = 0;
         u_char *buf;
         u_char *pos;
@@ -414,9 +291,9 @@ cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
          */
 
         unencoded_len = 0;
-        env_vars = (ngx_keyval_t *) conf->env_vars->elts;
+        env_vars = (ngx_keyval_t *) conf->autogenerated.env_vars->elts;
 
-        for (i = 0; i < conf->env_vars->nelts; i++) {
+        for (i = 0; i < conf->autogenerated.env_vars->nelts; i++) {
             unencoded_len += env_vars[i].key.len + 1 + env_vars[i].value.len + 1;
         }
 
@@ -430,7 +307,7 @@ cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
             return NGX_ERROR;
         }
 
-        for (i = 0; i < conf->env_vars->nelts; i++) {
+        for (i = 0; i < conf->autogenerated.env_vars->nelts; i++) {
             pos = ngx_copy(pos, env_vars[i].key.data, env_vars[i].key.len);
             *pos = '\0';
             pos++;
@@ -467,28 +344,44 @@ cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
     return NGX_OK;
 }
 
-#include "MergeLocationConfig.c"
-
 char *
 passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 {
     passenger_loc_conf_t         *prev = parent;
     passenger_loc_conf_t         *conf = child;
+    passenger_loc_conf_t         **children_elem;
     ngx_http_core_loc_conf_t     *clcf;
 
     size_t                        size;
     ngx_hash_init_t               hash;
 
     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+    /* The following works for all contexts within the http{} block, but does
+     * not work for the http{} block itself. To obtain the ngx_http_core_(loc|srv)_conf_t
+     * associated with the http{} block itself, we also set conf->(cscf|clcf)
+     * from record_loc_conf_source_location(), which is called from the various
+     * configuration setter functions.
+     */
+     conf->cscf = ngx_http_conf_get_module_srv_conf(cf, ngx_http_core_module);
+     conf->clcf = clcf;
+
+    if (passenger_merge_autogenerated_loc_conf(&conf->autogenerated, &prev->autogenerated, cf) == 0) {
+        return NGX_CONF_ERROR;
+    }
 
-    if (generated_merge_part(conf, prev, cf) == 0) {
+    conf->parent = prev;
+    children_elem = ngx_array_push(&prev->children);
+    if (children_elem == NULL) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
+            "cannot allocate memory");
         return NGX_CONF_ERROR;
     }
+    *children_elem = conf;
 
     if (prev->options_cache.data == NULL) {
-        if (cache_loc_conf_options(cf, prev) != NGX_OK) {
+        if (serialize_loc_conf_to_headers(cf, prev) != NGX_OK) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "cannot create " PROGRAM_NAME " configuration cache");
+                               "cannot create " PROGRAM_NAME " configuration serialization cache");
             return NGX_CONF_ERROR;
         }
     }
@@ -805,26 +698,27 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->upstream_config.upstream = prev->upstream_config.upstream;
     }
 
-    if (conf->enabled == 1 /* and not NGX_CONF_UNSET */
-     && passenger_main_conf.root_dir.len != 0
+    if (conf->autogenerated.enabled == 1 /* and not NGX_CONF_UNSET */
+     && passenger_main_conf.autogenerated.root_dir.len != 0
      && clcf->handler == NULL /* no handler set by other modules */)
     {
         clcf->handler = passenger_content_handler;
     }
 
-    conf->headers_hash_bucket_size = ngx_align(conf->headers_hash_bucket_size,
-                                               ngx_cacheline_size);
-    hash.max_size = conf->headers_hash_max_size;
-    hash.bucket_size = conf->headers_hash_bucket_size;
+    conf->autogenerated.headers_hash_bucket_size = ngx_align(
+        conf->autogenerated.headers_hash_bucket_size,
+        ngx_cacheline_size);
+    hash.max_size = conf->autogenerated.headers_hash_max_size;
+    hash.bucket_size = conf->autogenerated.headers_hash_bucket_size;
     hash.name = "passenger_headers_hash";
 
     if (merge_headers(cf, conf, prev) != NGX_OK) {
         return NGX_CONF_ERROR;
     }
 
-    if (cache_loc_conf_options(cf, conf) != NGX_OK) {
+    if (serialize_loc_conf_to_headers(cf, conf) != NGX_OK) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "cannot create " PROGRAM_NAME " configuration cache");
+                           "cannot create " PROGRAM_NAME " configuration serialization cache");
         return NGX_CONF_ERROR;
     }
 
@@ -845,12 +739,12 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
     ngx_http_script_compile_t     sc;
     ngx_http_script_copy_code_t  *copy;
 
-    if (conf->headers_source == NULL) {
+    if (conf->autogenerated.headers_source == NULL) {
         conf->flushes = prev->flushes;
         conf->headers_set_len = prev->headers_set_len;
         conf->headers_set = prev->headers_set;
         conf->headers_set_hash = prev->headers_set_hash;
-        conf->headers_source = prev->headers_source;
+        conf->autogenerated.headers_source = prev->autogenerated.headers_source;
     }
 
     if (conf->headers_set_hash.buckets
@@ -879,10 +773,10 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
         return NGX_ERROR;
     }
 
-    if (conf->headers_source == NULL) {
-        conf->headers_source = ngx_array_create(cf->pool, 4,
+    if (conf->autogenerated.headers_source == NULL) {
+        conf->autogenerated.headers_source = ngx_array_create(cf->pool, 4,
                                                 sizeof(ngx_keyval_t));
-        if (conf->headers_source == NULL) {
+        if (conf->autogenerated.headers_source == NULL) {
             return NGX_ERROR;
         }
     }
@@ -898,8 +792,8 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
     }
 
 
-    src = conf->headers_source->elts;
-    for (i = 0; i < conf->headers_source->nelts; i++) {
+    src = conf->autogenerated.headers_source->elts;
+    for (i = 0; i < conf->autogenerated.headers_source->nelts; i++) {
 
         s = ngx_array_push(&headers_merged);
         if (s == NULL) {
@@ -1055,8 +949,8 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
 
     hash.hash = &conf->headers_set_hash;
     hash.key = ngx_hash_key_lc;
-    hash.max_size = conf->headers_hash_max_size;
-    hash.bucket_size = conf->headers_hash_bucket_size;
+    hash.max_size = conf->autogenerated.headers_hash_max_size;
+    hash.bucket_size = conf->autogenerated.headers_hash_bucket_size;
     hash.name = "passenger_headers_hash";
     hash.pool = cf->pool;
     hash.temp_pool = NULL;
@@ -1091,142 +985,29 @@ merge_string_array(ngx_conf_t *cf, ngx_array_t **prev, ngx_array_t **conf)
     return NGX_OK;
 }
 
-struct postprocess_ctx_s {
-    /* Reserved for future use */
-};
-
 ngx_int_t
 passenger_postprocess_config(ngx_conf_t *cf)
 {
-    ngx_http_core_main_conf_t  *cmcf;
-    ngx_http_core_srv_conf_t   **server_confs, *server_conf;
-    ngx_http_core_loc_conf_t    *base_location_conf;
-    ngx_uint_t                  i;
-    ngx_int_t                   result;
-    postprocess_ctx_t           ctx;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-    server_confs = (ngx_http_core_srv_conf_t **) cmcf->servers.elts;
-
-    ngx_memzero(&ctx, sizeof(ctx));
+    ngx_http_conf_ctx_t  *http_ctx;
+    passenger_loc_conf_t *toplevel_plcf;
+    ngx_pool_cleanup_t   *manifest_cleanup;
 
-    for (i = 0; i < cmcf->servers.nelts; i++) {
-        server_conf = server_confs[i];
-        base_location_conf = server_conf->ctx->loc_conf[ngx_http_core_module.ctx_index];
+    http_ctx = cf->ctx;
+    toplevel_plcf = http_ctx->loc_conf[ngx_http_passenger_module.ctx_index];
 
-        result = postprocess_location_conf(cf, server_conf, base_location_conf, 1, &ctx);
-        if (result != NGX_OK) {
-            return result;
-        }
-    }
-
-    return NGX_OK;
-}
-
-static ngx_int_t
-postprocess_location_conf(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_core_loc_conf_t *location_conf,
-    int is_toplevel,
-    postprocess_ctx_t *ctx)
-{
-    passenger_loc_conf_t *plconf = server_conf->ctx->loc_conf[
-        ngx_http_passenger_module.ctx_index];
-
-    if (plconf->union_station_support != NGX_CONF_UNSET && plconf->union_station_support) {
-        passenger_main_conf.union_station_support = 1;
+    passenger_main_conf.default_ruby = toplevel_plcf->autogenerated.ruby;
+    if (passenger_main_conf.default_ruby.len == 0) {
+        passenger_main_conf.default_ruby.data = (u_char *) DEFAULT_RUBY;
+        passenger_main_conf.default_ruby.len = strlen(DEFAULT_RUBY);
     }
 
-    return traverse_location_confs_nested_in_server_conf(cf, server_conf, location_conf, ctx);
-}
-
-static ngx_int_t
-traverse_location_confs_nested_in_server_conf(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_core_loc_conf_t *location_conf,
-    postprocess_ctx_t *ctx)
-{
-    ngx_int_t result;
-
-    result = traverse_static_location_tree(cf, server_conf,
-        location_conf->static_locations, ctx);
-    if (result != NGX_OK) {
-        return result;
-    }
-
-#ifdef NGX_PCRE
-    return traverse_regex_locations(cf, server_conf,
-        location_conf->regex_locations, ctx);
-#else
-    return result;
-#endif
-}
-
-static ngx_int_t
-traverse_static_location_tree(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_location_tree_node_t *node,
-    postprocess_ctx_t *ctx)
-{
-    ngx_int_t result;
-
-    if (node == NULL) {
-        return NGX_OK;
-    }
-
-    if (node->left != NULL) {
-        result = traverse_static_location_tree(cf, server_conf, node->left, ctx);
-        if (result != NGX_OK) {
-            return result;
-        }
-    }
-
-    if (node->right != NULL) {
-        result = traverse_static_location_tree(cf, server_conf, node->right, ctx);
-        if (result != NGX_OK) {
-            return result;
-        }
-    }
-
-    if (node->exact != NULL) {
-        result = postprocess_location_conf(cf, server_conf,
-            node->exact, 0, ctx);
-    } else {
-        result = postprocess_location_conf(cf, server_conf,
-            node->inclusive, 0, ctx);
-    }
-    if (result != NGX_OK) {
-        return result;
-    }
-
-    return NGX_OK;
-}
-
-#ifdef NGX_PCRE
-static ngx_int_t
-traverse_regex_locations(ngx_conf_t *cf,
-    ngx_http_core_srv_conf_t *server_conf,
-    ngx_http_core_loc_conf_t **regex_locations,
-    postprocess_ctx_t *ctx)
-{
-    ngx_uint_t i;
-    ngx_int_t  result;
-
-    if (regex_locations == NULL) {
-        return NGX_OK;
-    }
-
-    for (i = 0; regex_locations[i] != NULL; i++) {
-        result = postprocess_location_conf(cf, server_conf,
-            regex_locations[i], 0, ctx);
-        if (result != NGX_OK) {
-            return result;
-        }
-    }
+    passenger_main_conf.manifest = generate_config_manifest(cf, toplevel_plcf);
+    manifest_cleanup = ngx_pool_cleanup_add(cf->pool, 0);
+    manifest_cleanup->handler = (ngx_pool_cleanup_pt) psg_json_value_free;
+    manifest_cleanup->data = passenger_main_conf.manifest;
 
     return NGX_OK;
 }
-#endif
 
 static int
 string_keyval_has_key(ngx_array_t *table, ngx_str_t *key)
@@ -1292,9 +1073,14 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_str_t                   *value;
     ngx_url_t                    upstream_url;
 
+    passenger_conf->autogenerated.enabled_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.enabled_source_file,
+        &passenger_conf->autogenerated.enabled_source_line);
+
     value = cf->args->elts;
     if (ngx_strcasecmp(value[1].data, (u_char *) "on") == 0) {
-        passenger_conf->enabled = 1;
+        passenger_conf->autogenerated.enabled = 1;
 
         /* Register a placeholder value as upstream address. The real upstream
          * address (the Passenger core socket filename) will be set while processing
@@ -1317,7 +1103,7 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             clcf->auto_redirect = 1;
         }
     } else if (ngx_strcasecmp(value[1].data, (u_char *) "off") == 0) {
-        passenger_conf->enabled = 0;
+        passenger_conf->autogenerated.enabled = 0;
     } else {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
             "\"passenger_enabled\" must be either set to \"on\" "
@@ -1329,51 +1115,6 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return NGX_CONF_OK;
 }
 
-char *
-union_station_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
-{
-    char  *p = conf;
-
-    ngx_str_t         *value, *s;
-    ngx_array_t      **a;
-    ngx_conf_post_t   *post;
-    char              *message;
-
-    a = (ngx_array_t **) (p + cmd->offset);
-
-    if (*a == NGX_CONF_UNSET_PTR) {
-        *a = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
-        if (*a == NULL) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
-    s = ngx_array_push(*a);
-    if (s == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    value = cf->args->elts;
-
-    *s = value[1];
-
-    if (cmd->post) {
-        post = cmd->post;
-        return post->post_handler(cf, post, s);
-    }
-
-    message = passenger_filter_validate((const char *) value[1].data, value[1].len);
-    if (message != NULL) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-            "Union Station filter syntax error: %s; ",
-            message);
-        free(message);
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
 static char *
 rails_framework_spawner_idle_time(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -1392,263 +1133,66 @@ passenger_use_global_queue(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 static char *
-set_null_terminated_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+passenger_obsolete_directive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    char  *p = conf;
+    ngx_conf_log_error(NGX_LOG_ALERT, cf, 0, "The '%V' directive is obsolete "
+        "and doesn't do anything anymore.", &cmd->name);
+    return NGX_CONF_OK;
+}
 
-    ngx_str_t         *value;
-    ngx_array_t      **a;
-    ngx_keyval_t      *kv;
-    ngx_conf_post_t   *post;
-    u_char            *last;
 
-    a = (ngx_array_t **) (p + cmd->offset);
+PsgJsonValue *
+psg_json_value_set_str_array(PsgJsonValue *doc, const char *name, ngx_array_t *ary) {
+    PsgJsonValue *subdoc = psg_json_value_new_with_type(PSG_JSON_VALUE_TYPE_ARRAY);
+    PsgJsonValue *elem, *result;
+    ngx_str_t *values;
+    ngx_uint_t i;
 
-    if (*a == NULL) {
-        *a = ngx_array_create(cf->pool, 4, sizeof(ngx_keyval_t));
-        if (*a == NULL) {
-            return NGX_CONF_ERROR;
+    if (ary != NULL) {
+        values = (ngx_str_t *) ary->elts;
+        for (i = 0; i < ary->nelts; i++) {
+            elem = psg_json_value_new_str(
+                (const char *) values[i].data, values[i].len);
+            psg_json_value_append_val(subdoc, elem);
+            psg_json_value_free(elem);
         }
     }
 
-    kv = ngx_array_push(*a);
-    if (kv == NULL) {
-        return NGX_CONF_ERROR;
-    }
+    result = psg_json_value_set_value(doc, name, -1, subdoc);
+    psg_json_value_free(subdoc);
 
-    value = cf->args->elts;
-
-    kv->key.data = ngx_palloc(cf->pool, value[1].len + 1);
-    kv->key.len  = value[1].len + 1;
-    last = ngx_copy(kv->key.data, value[1].data, value[1].len);
-    *last = '\0';
+    return result;
+}
 
-    kv->value.data = ngx_palloc(cf->pool, value[2].len + 1);
-    kv->value.len  = value[2].len + 1;
-    last = ngx_copy(kv->value.data, value[2].data, value[2].len);
-    *last = '\0';
+PsgJsonValue *
+psg_json_value_set_str_keyval(PsgJsonValue *doc, const char *name, ngx_array_t *ary) {
+    PsgJsonValue *subdoc = psg_json_value_new_with_type(PSG_JSON_VALUE_TYPE_OBJECT);
+    PsgJsonValue *elem, *result;
+    ngx_keyval_t *values;
+    ngx_uint_t i;
 
-    if (cmd->post) {
-        post = cmd->post;
-        return post->post_handler(cf, post, kv);
+    if (ary != NULL) {
+        values = (ngx_keyval_t *) ary->elts;
+        for (i = 0; i < ary->nelts; i++) {
+            elem = psg_json_value_new_str(
+                (const char *) values[i].value.data, values[i].value.len);
+            psg_json_value_set_value(subdoc,
+                (const char *) values[i].key.data, values[i].key.len,
+                elem);
+            psg_json_value_free(elem);
+        }
     }
 
-    return NGX_CONF_OK;
+    result = psg_json_value_set_value(doc, name, -1, subdoc);
+    psg_json_value_free(subdoc);
+
+    return result;
 }
 
 
 const ngx_command_t passenger_commands[] = {
 
-    /******** Main config ********/
-
-    { ngx_string("passenger_root"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, root_dir),
-      NULL },
-
-    { ngx_string("passenger_ctl"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE2,
-      set_null_terminated_keyval_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, ctl),
-      NULL },
-
-    { ngx_string("passenger_ruby"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, default_ruby),
-      NULL },
-
-    { ngx_string("passenger_log_level"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, log_level),
-      NULL },
-
-    { ngx_string("passenger_log_file"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, log_file),
-      NULL },
-
-    { ngx_string("passenger_file_descriptor_log_file"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, file_descriptor_log_file),
-      NULL },
-
-    { ngx_string("passenger_data_buffer_dir"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, data_buffer_dir),
-      NULL },
-
-    { ngx_string("passenger_instance_registry_dir"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, instance_registry_dir),
-      NULL },
-
-    { ngx_string("passenger_pre_start"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_array_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, prestart_uris),
-      NULL },
-
-    { ngx_string("passenger_disable_security_update_check"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, disable_security_update_check),
-      NULL },
-
-	{ ngx_string("passenger_security_update_check_proxy"),
-	  NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-	  ngx_conf_set_str_slot,
-	  NGX_HTTP_MAIN_CONF_OFFSET,
-	  offsetof(passenger_main_conf_t, security_update_check_proxy),
-	  NULL },
-
-	{ ngx_string("passenger_abort_on_startup_error"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, abort_on_startup_error),
-      NULL },
-
-    { ngx_string("passenger_max_pool_size"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, max_pool_size),
-      NULL },
-
-    { ngx_string("passenger_pool_idle_time"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, pool_idle_time),
-      NULL },
-
-    { ngx_string("passenger_response_buffer_high_watermark"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, response_buffer_high_watermark),
-      NULL },
-
-    { ngx_string("passenger_stat_throttle_rate"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, stat_throttle_rate),
-      NULL },
-
-    { ngx_string("passenger_show_version_in_header"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, show_version_in_header),
-      NULL },
-
-    { ngx_string("passenger_turbocaching"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, turbocaching),
-      NULL },
-
-    { ngx_string("passenger_user_switching"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, user_switching),
-      NULL },
-
-    { ngx_string("passenger_default_user"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, default_user),
-      NULL },
-
-    { ngx_string("passenger_default_group"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, default_group),
-      NULL },
-
-    { ngx_string("passenger_analytics_log_user"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, analytics_log_user),
-      NULL },
-
-    { ngx_string("passenger_analytics_log_group"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      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,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, union_station_gateway_address),
-      NULL },
-
-    { ngx_string("union_station_gateway_port"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, union_station_gateway_port),
-      NULL },
-
-    { ngx_string("union_station_gateway_cert"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, union_station_gateway_cert),
-      NULL },
-
-    { ngx_string("union_station_proxy_address"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, union_station_proxy_address),
-      NULL },
-
-    /******** Per-location config ********/
-
-    #include "ConfigurationCommands.c"
-
-    /******** Backward compatibility ********/
-
-    { ngx_string("passenger_debug_log_file"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, log_file),
-      NULL },
+    #include "ConfigGeneral/AutoGeneratedDefinitions.c"
 
     ngx_null_command
 };