passenger 5.2.1 → 5.2.2

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -38,6 +38,66 @@
  *   rake src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp
  */
 
+static const char *
+cmd_passenger_admin_panel_auth_type(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.adminPanelAuthTypeSourceFile = cmd->directive->filename;
+	serverConfig.adminPanelAuthTypeSourceLine = cmd->directive->line_num;
+	serverConfig.adminPanelAuthTypeExplicitlySet = true;
+	serverConfig.adminPanelAuthType = arg;
+	return NULL;
+}
+
+static const char *
+cmd_passenger_admin_panel_password(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.adminPanelPasswordSourceFile = cmd->directive->filename;
+	serverConfig.adminPanelPasswordSourceLine = cmd->directive->line_num;
+	serverConfig.adminPanelPasswordExplicitlySet = true;
+	serverConfig.adminPanelPassword = arg;
+	return NULL;
+}
+
+static const char *
+cmd_passenger_admin_panel_url(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.adminPanelUrlSourceFile = cmd->directive->filename;
+	serverConfig.adminPanelUrlSourceLine = cmd->directive->line_num;
+	serverConfig.adminPanelUrlExplicitlySet = true;
+	serverConfig.adminPanelUrl = arg;
+	return NULL;
+}
+
+static const char *
+cmd_passenger_admin_panel_username(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.adminPanelUsernameSourceFile = cmd->directive->filename;
+	serverConfig.adminPanelUsernameSourceLine = cmd->directive->line_num;
+	serverConfig.adminPanelUsernameExplicitlySet = true;
+	serverConfig.adminPanelUsername = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_allow_encoded_slashes(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
@@ -226,6 +286,21 @@ cmd_passenger_disable_security_update_check(cmd_parms *cmd, void *pcfg, const ch
 	return NULL;
 }
 
+static const char *
+cmd_passenger_dump_config_manifest(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.dumpConfigManifestSourceFile = cmd->directive->filename;
+	serverConfig.dumpConfigManifestSourceLine = cmd->directive->line_num;
+	serverConfig.dumpConfigManifestExplicitlySet = true;
+	serverConfig.dumpConfigManifest = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_enabled(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
@@ -502,6 +577,21 @@ cmd_passenger_min_instances(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return setIntConfig(cmd, arg, config->mMinInstances, 0);
 }
 
+static const char *
+cmd_passenger_monitor_log_file(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
+	if (err != NULL) {
+		return err;
+	}
+
+	DirConfig *config = (DirConfig *) pcfg;
+	config->mMonitorLogFileSourceFile = cmd->directive->filename;
+	config->mMonitorLogFileSourceLine = cmd->directive->line_num;
+	config->mMonitorLogFileExplicitlySet = true;
+	config->mMonitorLogFile.insert(arg);
+	return NULL;
+}
+
 static const char *
 cmd_passenger_nodejs(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);

data/src/apache2_module/ConfigGeneral/ManifestGeneration.h

@@ -28,6 +28,7 @@
 
 #include <string>
 #include <cstddef>
+#include <string>
 #include <boost/function.hpp>
 #include <jsoncpp/json.h>
 
@@ -98,6 +99,17 @@ private:
 			Json::Value &appConfigContainer = findOrCreateAppConfigContainer(appGroupName);
 			*appOptionsContainer = &appConfigContainer["options"];
 			*locOptionsContainer = &appConfigContainer["default_location_configuration"];
+
+			// Create a default value for passenger_app_root
+			// if we just created this config container
+			if ((*appOptionsContainer)->empty()) {
+				addOptionsContainerStaticDefaultStr(**appOptionsContainer,
+					"PassengerAppGroupName",
+					appGroupName);
+				addOptionsContainerStaticDefaultStr(**appOptionsContainer,
+					"PassengerAppRoot",
+					inferDefaultAppRoot(csconf));
+			}
 		} else {
 			// We are inside a <Directory> or <Location>
 			string appGroupName = inferLocConfAppGroupName(csconf, pdconf);
@@ -135,6 +147,10 @@ private:
 		}
 	}
 
+	string inferDefaultAppRoot(core_server_config *csconf) {
+		return absolutizePath(csconf->ap_document_root + P_STATIC_STRING("/.."));
+	}
+
 	Json::Value	&findOrCreateAppConfigContainer(const string &appGroupName) {
 		Json::Value &result = manifest["application_configurations"][appGroupName];
 		if (result.isNull()) {
@@ -261,8 +277,8 @@ private:
 		Json::Value &appConfigsContainer = manifest["application_configurations"];
 		Json::Value::iterator it, end = appConfigsContainer.end();
 
-		reverseValueHierarchiesInOptionsContainer(manifest["global_config"]);
-		reverseValueHierarchiesInOptionsContainer(manifest["application_configurations"]);
+		reverseValueHierarchiesInOptionsContainer(manifest["global_configuration"]);
+		reverseValueHierarchiesInOptionsContainer(manifest["default_application_configuration"]);
 		reverseValueHierarchiesInOptionsContainer(manifest["default_location_configuration"]);
 
 		for (it = appConfigsContainer.begin(); it != end; it++) {

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp

@@ -77,6 +77,9 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	 * config->mMeteorAppSettings: default initialized
 	 */
 	config->mMinInstances = UNSET_INT_VALUE;
+	/*
+	 * config->mMonitorLogFile: default initialized
+	 */
 	/*
 	 * config->mNodejs: default initialized
 	 */
@@ -125,6 +128,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mMaxRequestsSourceLine = 0;
 	config->mMeteorAppSettingsSourceLine = 0;
 	config->mMinInstancesSourceLine = 0;
+	config->mMonitorLogFileSourceLine = 0;
 	config->mNodejsSourceLine = 0;
 	config->mPythonSourceLine = 0;
 	config->mRestartDirSourceLine = 0;
@@ -157,6 +161,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mMaxRequestsExplicitlySet = false;
 	config->mMeteorAppSettingsExplicitlySet = false;
 	config->mMinInstancesExplicitlySet = false;
+	config->mMonitorLogFileExplicitlySet = false;
 	config->mNodejsExplicitlySet = false;
 	config->mPythonExplicitlySet = false;
 	config->mRestartDirExplicitlySet = false;

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -292,6 +292,18 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mMinInstancesSourceLine);
 		hierarchyMember["value"] = pdconf->mMinInstances;
 	}
+	if (pdconf->mMonitorLogFileExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerMonitorLogFile",
+			sizeof("PassengerMonitorLogFile") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mMonitorLogFileSourceFile,
+			pdconf->mMonitorLogFileSourceLine);
+		hierarchyMember["value"] = strCollectionToJson< std::set<std::string>, std::string >(
+			pdconf->mMonitorLogFile);
+	}
 	if (pdconf->mNodejsExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -126,6 +126,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(add->mMinInstances != UNSET_INT_VALUE)
 		? add->mMinInstances
 		: base->mMinInstances;
+	config->mMonitorLogFile =
+		(!add->mMonitorLogFile.empty())
+		? add->mMonitorLogFile
+		: base->mMonitorLogFile;
 	config->mNodejs =
 		(!add->mNodejs.empty())
 		? add->mNodejs
@@ -188,6 +192,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMaxRequestsSourceFile = add->mMaxRequestsSourceFile;
 	config->mMeteorAppSettingsSourceFile = add->mMeteorAppSettingsSourceFile;
 	config->mMinInstancesSourceFile = add->mMinInstancesSourceFile;
+	config->mMonitorLogFileSourceFile = add->mMonitorLogFileSourceFile;
 	config->mNodejsSourceFile = add->mNodejsSourceFile;
 	config->mPythonSourceFile = add->mPythonSourceFile;
 	config->mRestartDirSourceFile = add->mRestartDirSourceFile;
@@ -220,6 +225,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMaxRequestsSourceLine = add->mMaxRequestsSourceLine;
 	config->mMeteorAppSettingsSourceLine = add->mMeteorAppSettingsSourceLine;
 	config->mMinInstancesSourceLine = add->mMinInstancesSourceLine;
+	config->mMonitorLogFileSourceLine = add->mMonitorLogFileSourceLine;
 	config->mNodejsSourceLine = add->mNodejsSourceLine;
 	config->mPythonSourceLine = add->mPythonSourceLine;
 	config->mRestartDirSourceLine = add->mRestartDirSourceLine;
@@ -252,6 +258,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mMaxRequestsExplicitlySet = add->mMaxRequestsExplicitlySet;
 	config->mMeteorAppSettingsExplicitlySet = add->mMeteorAppSettingsExplicitlySet;
 	config->mMinInstancesExplicitlySet = add->mMinInstancesExplicitlySet;
+	config->mMonitorLogFileExplicitlySet = add->mMonitorLogFileExplicitlySet;
 	config->mNodejsExplicitlySet = add->mNodejsExplicitlySet;
 	config->mPythonExplicitlySet = add->mPythonExplicitlySet;
 	config->mRestartDirExplicitlySet = add->mRestartDirExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -194,6 +194,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	std::set<std::string> mBaseURIs;
 
+	/*
+	 * Log file path to monitor.
+	 */
+	std::set<std::string> mMonitorLogFile;
+
 
 	StaticString mAllowEncodedSlashesSourceFile;
 	StaticString mBufferResponseSourceFile;
@@ -226,6 +231,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mStickySessionsCookieNameSourceFile;
 	StaticString mUserSourceFile;
 	StaticString mBaseURIsSourceFile;
+	StaticString mMonitorLogFileSourceFile;
 
 	unsigned int mAllowEncodedSlashesSourceLine;
 	unsigned int mBufferResponseSourceLine;
@@ -258,6 +264,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mStickySessionsCookieNameSourceLine;
 	unsigned int mUserSourceLine;
 	unsigned int mBaseURIsSourceLine;
+	unsigned int mMonitorLogFileSourceLine;
 
 	bool mAllowEncodedSlashesExplicitlySet: 1;
 	bool mBufferResponseExplicitlySet: 1;
@@ -290,6 +297,7 @@ struct AutoGeneratedDirConfig {
 	bool mStickySessionsCookieNameExplicitlySet: 1;
 	bool mUserExplicitlySet: 1;
 	bool mBaseURIsExplicitlySet: 1;
+	bool mMonitorLogFileExplicitlySet: 1;
 
 
 	bool
@@ -531,4 +539,9 @@ struct AutoGeneratedDirConfig {
 		return mBaseURIs;
 	}
 
+	const std::set<std::string> &
+	getMonitorLogFile() const {
+		return mMonitorLogFile;
+	}
+
 };

data/src/apache2_module/Hooks.cpp

@@ -1330,6 +1330,10 @@ public:
 		config["stat_throttle_rate"] = serverConfig.statThrottleRate;
 		config["turbocaching"] = serverConfig.turbocaching;
 		config["prestart_urls"] = strsetToJson(serverConfig.prestartURLs);
+		config["admin_panel_url"] = nonEmptyString(serverConfig.adminPanelUrl);
+		config["admin_panel_auth_type"] = nonEmptyString(serverConfig.adminPanelAuthType);
+		config["admin_panel_username"] = nonEmptyString(serverConfig.adminPanelUsername);
+		config["admin_panel_password"] = nonEmptyString(serverConfig.adminPanelPassword);
 
 		if (!serverConfig.logFile.empty()) {
 			config["log_target"] = serverConfig.logFile.toString();

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -47,6 +47,50 @@ void
 ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 	Json::Value &globalOptionsContainer = manifest["global_configuration"];
 
+	if (serverConfig.adminPanelAuthTypeExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerAdminPanelAuthType",
+			sizeof("PassengerAdminPanelAuthType") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.adminPanelAuthTypeSourceFile,
+			serverConfig.adminPanelAuthTypeSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.adminPanelAuthType.data(),
+			serverConfig.adminPanelAuthType.data() + serverConfig.adminPanelAuthType.size());
+	}
+	if (serverConfig.adminPanelPasswordExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerAdminPanelPassword",
+			sizeof("PassengerAdminPanelPassword") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.adminPanelPasswordSourceFile,
+			serverConfig.adminPanelPasswordSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.adminPanelPassword.data(),
+			serverConfig.adminPanelPassword.data() + serverConfig.adminPanelPassword.size());
+	}
+	if (serverConfig.adminPanelUrlExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerAdminPanelUrl",
+			sizeof("PassengerAdminPanelUrl") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.adminPanelUrlSourceFile,
+			serverConfig.adminPanelUrlSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.adminPanelUrl.data(),
+			serverConfig.adminPanelUrl.data() + serverConfig.adminPanelUrl.size());
+	}
+	if (serverConfig.adminPanelUsernameExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerAdminPanelUsername",
+			sizeof("PassengerAdminPanelUsername") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.adminPanelUsernameSourceFile,
+			serverConfig.adminPanelUsernameSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.adminPanelUsername.data(),
+			serverConfig.adminPanelUsername.data() + serverConfig.adminPanelUsername.size());
+	}
 	if (serverConfig.dataBufferDirExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerDataBufferDir",
@@ -100,6 +144,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.disableSecurityUpdateCheckSourceLine);
 		hierarchyMember["value"] = serverConfig.disableSecurityUpdateCheck == Apache2Module::ENABLED;
 	}
+	if (serverConfig.dumpConfigManifestExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerDumpConfigManifest",
+			sizeof("PassengerDumpConfigManifest") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.dumpConfigManifestSourceFile,
+			serverConfig.dumpConfigManifestSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.dumpConfigManifest.data(),
+			serverConfig.dumpConfigManifest.data() + serverConfig.dumpConfigManifest.size());
+	}
 	if (serverConfig.fileDescriptorLogFileExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerFileDescriptorLogFile",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -94,6 +94,26 @@ struct AutoGeneratedServerConfig {
 	 */
 	int statThrottleRate;
 
+	/*
+	 * The authentication type to use when connecting to the admin panel
+	 */
+	StaticString adminPanelAuthType;
+
+	/*
+	 * The password to use when connecting to the admin panel using basic authentication
+	 */
+	StaticString adminPanelPassword;
+
+	/*
+	 * Connect to an admin panel at the given connector URL
+	 */
+	StaticString adminPanelUrl;
+
+	/*
+	 * The username to use when connecting to the admin panel using basic authentication
+	 */
+	StaticString adminPanelUsername;
+
 	/*
 	 * The directory that Phusion Passenger data buffers should be stored into.
 	 */
@@ -114,6 +134,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	StaticString defaultUser;
 
+	/*
+	 * Dump the Passenger config manifest to the given file, for debugging purposes.
+	 */
+	StaticString dumpConfigManifest;
+
 	/*
 	 * The Phusion Passenger file descriptor log file.
 	 */
@@ -156,10 +181,15 @@ struct AutoGeneratedServerConfig {
 	StaticString responseBufferHighWatermarkSourceFile;
 	StaticString socketBacklogSourceFile;
 	StaticString statThrottleRateSourceFile;
+	StaticString adminPanelAuthTypeSourceFile;
+	StaticString adminPanelPasswordSourceFile;
+	StaticString adminPanelUrlSourceFile;
+	StaticString adminPanelUsernameSourceFile;
 	StaticString dataBufferDirSourceFile;
 	StaticString defaultGroupSourceFile;
 	StaticString defaultRubySourceFile;
 	StaticString defaultUserSourceFile;
+	StaticString dumpConfigManifestSourceFile;
 	StaticString fileDescriptorLogFileSourceFile;
 	StaticString instanceRegistryDirSourceFile;
 	StaticString logFileSourceFile;
@@ -178,10 +208,15 @@ struct AutoGeneratedServerConfig {
 	unsigned int responseBufferHighWatermarkSourceLine;
 	unsigned int socketBacklogSourceLine;
 	unsigned int statThrottleRateSourceLine;
+	unsigned int adminPanelAuthTypeSourceLine;
+	unsigned int adminPanelPasswordSourceLine;
+	unsigned int adminPanelUrlSourceLine;
+	unsigned int adminPanelUsernameSourceLine;
 	unsigned int dataBufferDirSourceLine;
 	unsigned int defaultGroupSourceLine;
 	unsigned int defaultRubySourceLine;
 	unsigned int defaultUserSourceLine;
+	unsigned int dumpConfigManifestSourceLine;
 	unsigned int fileDescriptorLogFileSourceLine;
 	unsigned int instanceRegistryDirSourceLine;
 	unsigned int logFileSourceLine;
@@ -200,10 +235,15 @@ struct AutoGeneratedServerConfig {
 	bool responseBufferHighWatermarkExplicitlySet: 1;
 	bool socketBacklogExplicitlySet: 1;
 	bool statThrottleRateExplicitlySet: 1;
+	bool adminPanelAuthTypeExplicitlySet: 1;
+	bool adminPanelPasswordExplicitlySet: 1;
+	bool adminPanelUrlExplicitlySet: 1;
+	bool adminPanelUsernameExplicitlySet: 1;
 	bool dataBufferDirExplicitlySet: 1;
 	bool defaultGroupExplicitlySet: 1;
 	bool defaultRubyExplicitlySet: 1;
 	bool defaultUserExplicitlySet: 1;
+	bool dumpConfigManifestExplicitlySet: 1;
 	bool fileDescriptorLogFileExplicitlySet: 1;
 	bool instanceRegistryDirExplicitlySet: 1;
 	bool logFileExplicitlySet: 1;
@@ -224,6 +264,18 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermark = DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK;
 		socketBacklog = DEFAULT_SOCKET_BACKLOG;
 		statThrottleRate = DEFAULT_STAT_THROTTLE_RATE;
+		/*
+		 * adminPanelAuthType: default initialized
+		 */
+		/*
+		 * adminPanelPassword: default initialized
+		 */
+		/*
+		 * adminPanelUrl: default initialized
+		 */
+		/*
+		 * adminPanelUsername: default initialized
+		 */
 		/*
 		 * dataBufferDir: default initialized
 		 */
@@ -232,6 +284,9 @@ struct AutoGeneratedServerConfig {
 		 */
 		defaultRuby = DEFAULT_RUBY;
 		defaultUser = PASSENGER_DEFAULT_USER;
+		/*
+		 * dumpConfigManifest: default initialized
+		 */
 		/*
 		 * fileDescriptorLogFile: default initialized
 		 */
@@ -262,10 +317,15 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermarkSourceLine = 0;
 		socketBacklogSourceLine = 0;
 		statThrottleRateSourceLine = 0;
+		adminPanelAuthTypeSourceLine = 0;
+		adminPanelPasswordSourceLine = 0;
+		adminPanelUrlSourceLine = 0;
+		adminPanelUsernameSourceLine = 0;
 		dataBufferDirSourceLine = 0;
 		defaultGroupSourceLine = 0;
 		defaultRubySourceLine = 0;
 		defaultUserSourceLine = 0;
+		dumpConfigManifestSourceLine = 0;
 		fileDescriptorLogFileSourceLine = 0;
 		instanceRegistryDirSourceLine = 0;
 		logFileSourceLine = 0;
@@ -284,10 +344,15 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermarkExplicitlySet = false;
 		socketBacklogExplicitlySet = false;
 		statThrottleRateExplicitlySet = false;
+		adminPanelAuthTypeExplicitlySet = false;
+		adminPanelPasswordExplicitlySet = false;
+		adminPanelUrlExplicitlySet = false;
+		adminPanelUsernameExplicitlySet = false;
 		dataBufferDirExplicitlySet = false;
 		defaultGroupExplicitlySet = false;
 		defaultRubyExplicitlySet = false;
 		defaultUserExplicitlySet = false;
+		dumpConfigManifestExplicitlySet = false;
 		fileDescriptorLogFileExplicitlySet = false;
 		instanceRegistryDirExplicitlySet = false;
 		logFileExplicitlySet = false;