passenger 5.3.4 → 5.3.5

data/src/agent/Shared/Fundamentals/AbortHandler.h

@@ -36,7 +36,23 @@ namespace Fundamentals {
 
 
 struct AbortHandlerConfig {
-	typedef void (*DiagnosticsDumper)(void *userData);
+	static const unsigned int MAX_DIAGNOSTICS_DUMPERS = 5;
+	typedef void (*DiagnosticsDumperFunc)(void *userData);
+
+	struct DiagnosticsDumper {
+		const char *name;
+		const char *logFileName;
+		DiagnosticsDumperFunc func;
+		void *userData;
+
+		DiagnosticsDumper()
+			: name(0),
+			  logFileName(0),
+			  func(0),
+			  userData(0)
+			{ }
+	};
+
 
 	char *ruby;
 	char **origArgv;
@@ -45,8 +61,7 @@ struct AbortHandlerConfig {
 	bool beep;
 	bool stopProcess;
 	ResourceLocator *resourceLocator;
-	DiagnosticsDumper diagnosticsDumper;
-	void *diagnosticsDumperUserData;
+	DiagnosticsDumper diagnosticsDumpers[MAX_DIAGNOSTICS_DUMPERS];
 };
 
 void installAbortHandler(const AbortHandlerConfig *config);

data/src/agent/Watchdog/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -146,7 +146,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/5.3.4")
+ *   server_software                                                          string             -          default("Phusion_Passenger/5.3.5")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only
@@ -155,6 +155,17 @@ using namespace std;
  *   standalone_engine                                                        string             -          default
  *   startup_report_file                                                      string             -          -
  *   stat_throttle_rate                                                       unsigned integer   -          default(10)
+ *   telemetry_collector_ca_certificate_path                                  string             -          -
+ *   telemetry_collector_debug_curl                                           boolean            -          default(false)
+ *   telemetry_collector_disabled                                             boolean            -          default(false)
+ *   telemetry_collector_final_run_timeout                                    unsigned integer   -          default(5)
+ *   telemetry_collector_first_interval                                       unsigned integer   -          default(7200)
+ *   telemetry_collector_interval                                             unsigned integer   -          default(21600)
+ *   telemetry_collector_interval_jitter                                      unsigned integer   -          default(7200)
+ *   telemetry_collector_proxy_url                                            string             -          -
+ *   telemetry_collector_timeout                                              unsigned integer   -          default(180)
+ *   telemetry_collector_url                                                  string             -          default("https://anontelemetry.phusionpassenger.com/v1/collect.json")
+ *   telemetry_collector_verify_server                                        boolean            -          default(true)
  *   turbocaching                                                             boolean            -          default(true),read_only
  *   user                                                                     string             -          default,read_only
  *   user_switching                                                           boolean            -          default(true)
@@ -253,9 +264,13 @@ private:
 	}
 
 public:
-	struct {
+	struct CoreSubschemaContainer {
 		Core::Schema schema;
 		ConfigKit::TableTranslator translator;
+
+		CoreSubschemaContainer(const WrapperRegistry::Registry *wrapperRegistry)
+			: schema(wrapperRegistry)
+			{ }
 	} core;
 	struct {
 		ApiServer::Schema schema;
@@ -266,7 +281,9 @@ public:
 		ConfigKit::PrefixTranslator translator;
 	} apiServerKit;
 
-	Schema() {
+	Schema(const WrapperRegistry::Registry *wrapperRegistry = NULL)
+		: core(wrapperRegistry)
+	{
 		using namespace ConfigKit;
 
 		// Add subschema: core

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -165,6 +165,7 @@ namespace Watchdog {
 
 using namespace Passenger::Watchdog;
 
+static WrapperRegistry::Registry *watchdogWrapperRegistry;
 static Schema *watchdogSchema;
 static ConfigKit::Store *watchdogConfig;
 static WorkingObjects *workingObjects;
@@ -800,7 +801,9 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	string oldOomScore = setOomScoreNeverKill();
 #endif
 
-	watchdogSchema = new Schema();
+	watchdogWrapperRegistry = new WrapperRegistry::Registry();
+	watchdogWrapperRegistry->finalize();
+	watchdogSchema = new Schema(watchdogWrapperRegistry);
 	watchdogConfig = new ConfigKit::Store(*watchdogSchema);
 	initializeAgent(argc, &argv, SHORT_PROGRAM_NAME " watchdog",
 		*watchdogConfig, watchdogSchema->core.schema.loggingKit.translator,

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -73,6 +73,11 @@ AP_INIT_TAKE1("PassengerAnalyticsLogUser",
 	NULL,
 	RSRC_CONF,
 	"Obsolete option."),
+AP_INIT_TAKE1("PassengerAnonymousTelemetryProxy",
+	(Take1Func) cmd_passenger_anonymous_telemetry_proxy,
+	NULL,
+	RSRC_CONF,
+	"Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection."),
 AP_INIT_TAKE1("PassengerAppEnv",
 	(Take1Func) cmd_passenger_app_env,
 	NULL,
@@ -153,6 +158,11 @@ AP_INIT_TAKE1("PassengerDefaultUser",
 	NULL,
 	RSRC_CONF,
 	"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+AP_INIT_FLAG("PassengerDisableAnonymousTelemetry",
+	(FlagFunc) cmd_passenger_disable_anonymous_telemetry,
+	NULL,
+	RSRC_CONF,
+	"Whether to disable Phusion Passenger anonymous telemetry."),
 AP_INIT_FLAG("PassengerDisableSecurityUpdateCheck",
 	(FlagFunc) cmd_passenger_disable_security_update_check,
 	NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -68,6 +68,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerDefaultUser",
 		PASSENGER_DEFAULT_USER);
 
+	addOptionsContainerStaticDefaultBool(
+		globalConfigContainer,
+		"PassengerDisableAnonymousTelemetry",
+		false);
+
 	addOptionsContainerStaticDefaultBool(
 		globalConfigContainer,
 		"PassengerDisableSecurityUpdateCheck",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -125,6 +125,21 @@ cmd_passenger_analytics_log_user(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_anonymous_telemetry_proxy(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.anonymousTelemetryProxySourceFile = cmd->directive->filename;
+	serverConfig.anonymousTelemetryProxySourceLine = cmd->directive->line_num;
+	serverConfig.anonymousTelemetryProxyExplicitlySet = true;
+	serverConfig.anonymousTelemetryProxy = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_app_env(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
@@ -271,6 +286,21 @@ cmd_passenger_default_user(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_disable_anonymous_telemetry(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.disableAnonymousTelemetrySourceFile = cmd->directive->filename;
+	serverConfig.disableAnonymousTelemetrySourceLine = cmd->directive->line_num;
+	serverConfig.disableAnonymousTelemetryExplicitlySet = true;
+	serverConfig.disableAnonymousTelemetry = arg != NULL;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_disable_security_update_check(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);

data/src/apache2_module/DirectoryMapper.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -33,7 +33,7 @@
 #include <oxt/backtrace.hpp>
 #include <boost/thread.hpp>
 
-#include <AppTypes.h>
+#include <AppTypeDetector/Detector.h>
 #include <Utils.h>
 #include <Utils/CachedFileStat.hpp>
 
@@ -72,6 +72,7 @@ public:
  */
 class DirectoryMapper {
 private:
+	const WrapperRegistry::Registry &registry;
 	DirConfig *config;
 	request_rec *r;
 	CachedFileStat *cstat;
@@ -80,8 +81,8 @@ private:
 	string publicDir;
 	string appRoot;
 	unsigned int throttleRate;
-	PassengerAppType appType: 7;
-	bool autoDetectionDone: 1;
+	AppTypeDetector::Detector::Result detectorResult;
+	bool autoDetectionDone;
 
 	const char *findBaseURI() const {
 		set<string>::const_iterator it, end = config->getBaseURIs().end();
@@ -146,30 +147,28 @@ private:
 		}
 
 		UPDATE_TRACE_POINT();
-		AppTypeDetector detector(cstat, cstatMutex, throttleRate);
-		PassengerAppType appType;
+		AppTypeDetector::Detector detector(registry, cstat,
+			cstatMutex, throttleRate);
+		AppTypeDetector::Detector::Result detectorResult;
 		string appRoot;
 		if (config->getAppType().empty()) {
 			if (config->getAppRoot().empty()) {
-				appType = detector.checkDocumentRoot(publicDir,
+				detectorResult = detector.checkDocumentRoot(publicDir,
 					baseURI != NULL,
 					&appRoot);
 			} else {
 				appRoot = config->getAppRoot();
-				appType = detector.checkAppRoot(appRoot);
-			}
-		} else {
-			if (config->getAppRoot().empty()) {
-				appType = PAT_NONE;
-			} else {
-				appRoot = config->getAppRoot().toString();
-				appType = getAppType(config->getAppType());
+				detectorResult = detector.checkAppRoot(appRoot);
 			}
+		} else if (!config->getAppRoot().empty()) {
+			appRoot = config->getAppRoot().toString();
+			detectorResult.wrapperRegistryEntry = &registry.lookup(
+				config->getAppType());
 		}
 
 		this->appRoot = appRoot;
 		this->baseURI = baseURI;
-		this->appType = appType;
+		this->detectorResult = detectorResult;
 		autoDetectionDone = true;
 	}
 
@@ -184,14 +183,17 @@ public:
 	 * @warning Do not use this object after the destruction of <tt>r</tt>,
 	 *          <tt>config</tt> or <tt>cstat</tt>.
 	 */
-	DirectoryMapper(request_rec *r, DirConfig *config, CachedFileStat *cstat,
-	                boost::mutex *cstatMutex, unsigned int throttleRate) {
+	DirectoryMapper(request_rec *r, DirConfig *config,
+		const WrapperRegistry::Registry &_registry,
+		CachedFileStat *cstat, boost::mutex *cstatMutex,
+		unsigned int throttleRate)
+		: registry(_registry)
+	{
 		this->r = r;
 		this->config = config;
 		this->cstat = cstat;
 		this->cstatMutex = cstatMutex;
 		this->throttleRate = throttleRate;
-		appType = PAT_NONE;
 		baseURI = NULL;
 		autoDetectionDone = false;
 	}
@@ -243,30 +245,16 @@ public:
 	}
 
 	/**
-	 * Returns the application type that's associated with the HTTP request.
-	 *
-	 * @throws FileSystemException An error occured while examening the filesystem.
-	 * @throws DocumentRootDeterminationError Unable to query the location of the document root.
-	 * @throws TimeRetrievalException
-	 * @throws boost::thread_interrupted
-	 */
-	PassengerAppType getApplicationType() {
-		autoDetect();
-		return appType;
-	}
-
-	/**
-	 * Returns the application type (as a string) that's associated
-	 * with the HTTP request.
+	 * Returns the application detector result associated with the HTTP request.
 	 *
 	 * @throws FileSystemException An error occured while examening the filesystem.
 	 * @throws DocumentRootDeterminationError Unable to query the location of the document root.
 	 * @throws TimeRetrievalException
 	 * @throws boost::thread_interrupted
 	 */
-	const char *getApplicationTypeName() {
+	AppTypeDetector::Detector::Result getDetectorResult() {
 		autoDetect();
-		return getAppTypeName(appType);
+		return detectorResult;
 	}
 };
 

data/src/apache2_module/Hooks.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -60,6 +60,7 @@
 #include "DirectoryMapper.h"
 #include "Utils.h"
 #include <modp_b64.h>
+#include <WrapperRegistry/Registry.h>
 #include <FileTools/FileManip.h>
 #include <FileTools/FileManip.h>
 #include <Utils.h>
@@ -232,6 +233,7 @@ private:
 	enum Threeway { YES, NO, UNKNOWN };
 
 	Threeway m_hasModRewrite, m_hasModDir, m_hasModAutoIndex, m_hasModXsendfile;
+	WrapperRegistry::Registry wrapperRegistry;
 	CachedFileStat cstat;
 	WatchdogLauncher watchdogLauncher;
 	boost::mutex cstatMutex;
@@ -443,9 +445,10 @@ private:
 	bool prepareRequest(request_rec *r, DirConfig *config, const char *filename, bool coreModuleWillBeRun = false) {
 		TRACE_POINT();
 
-		DirectoryMapper mapper(r, config, &cstat, &cstatMutex, serverConfig.statThrottleRate);
+		DirectoryMapper mapper(r, config, wrapperRegistry, &cstat,
+			&cstatMutex, serverConfig.statThrottleRate);
 		try {
-			if (mapper.getApplicationType() == PAT_NONE) {
+			if (mapper.getDetectorResult().isNull()) {
 				// (B) is not true.
 				disableRequestNote(r);
 				return false;
@@ -983,8 +986,10 @@ private:
 		}
 
 		// Phusion Passenger options.
-		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_ROOT"), mapper.getAppRoot());
-		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_TYPE"), mapper.getApplicationTypeName());
+		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_ROOT"),
+			mapper.getAppRoot());
+		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_TYPE"),
+			mapper.getDetectorResult().wrapperRegistryEntry->language);
 		constructRequestHeaders_autoGenerated(r, config, result);
 
 		/*********************/
@@ -1247,6 +1252,7 @@ public:
 	    : cstat(1024),
 	      watchdogLauncher(IM_APACHE)
 	{
+		wrapperRegistry.finalize();
 		postprocessConfig(s, pconf, ptemp);
 
 		Json::Value loggingConfig;
@@ -1319,6 +1325,8 @@ public:
 		config["instance_registry_dir"] = nonEmptyString(serverConfig.instanceRegistryDir);
 		config["security_update_checker_disabled"] = serverConfig.disableSecurityUpdateCheck;
 		config["security_update_checker_proxy_url"] = nonEmptyString(serverConfig.securityUpdateCheckProxy);
+		config["telemetry_collector_disabled"] = serverConfig.disableAnonymousTelemetry;
+		config["telemetry_collector_proxy_url"] = nonEmptyString(serverConfig.anonymousTelemetryProxy);
 		config["user_switching"] = serverConfig.userSwitching;
 		config["default_user"] = serverConfig.defaultUser.toString();
 		config["default_group"] = serverConfig.defaultGroup.toString();

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -91,6 +91,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.adminPanelUsername.data(),
 			serverConfig.adminPanelUsername.data() + serverConfig.adminPanelUsername.size());
 	}
+	if (serverConfig.anonymousTelemetryProxyExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerAnonymousTelemetryProxy",
+			sizeof("PassengerAnonymousTelemetryProxy") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.anonymousTelemetryProxySourceFile,
+			serverConfig.anonymousTelemetryProxySourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.anonymousTelemetryProxy.data(),
+			serverConfig.anonymousTelemetryProxy.data() + serverConfig.anonymousTelemetryProxy.size());
+	}
 	if (serverConfig.dataBufferDirExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerDataBufferDir",
@@ -135,6 +146,15 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.defaultUser.data(),
 			serverConfig.defaultUser.data() + serverConfig.defaultUser.size());
 	}
+	if (serverConfig.disableAnonymousTelemetryExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerDisableAnonymousTelemetry",
+			sizeof("PassengerDisableAnonymousTelemetry") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.disableAnonymousTelemetrySourceFile,
+			serverConfig.disableAnonymousTelemetrySourceLine);
+		hierarchyMember["value"] = serverConfig.disableAnonymousTelemetry == Apache2Module::ENABLED;
+	}
 	if (serverConfig.disableSecurityUpdateCheckExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerDisableSecurityUpdateCheck",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -39,6 +39,11 @@
 
 struct AutoGeneratedServerConfig {
 
+	/*
+	 * Whether to disable Phusion Passenger anonymous telemetry.
+	 */
+	bool disableAnonymousTelemetry;
+
 	/*
 	 * Whether to disable the Phusion Passenger security update check & notification.
 	 */
@@ -114,6 +119,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	StaticString adminPanelUsername;
 
+	/*
+	 * Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection.
+	 */
+	StaticString anonymousTelemetryProxy;
+
 	/*
 	 * The directory that Phusion Passenger data buffers should be stored into.
 	 */
@@ -170,6 +180,7 @@ struct AutoGeneratedServerConfig {
 	std::set<std::string> prestartURLs;
 
 
+	StaticString disableAnonymousTelemetrySourceFile;
 	StaticString disableSecurityUpdateCheckSourceFile;
 	StaticString showVersionInHeaderSourceFile;
 	StaticString turbocachingSourceFile;
@@ -185,6 +196,7 @@ struct AutoGeneratedServerConfig {
 	StaticString adminPanelPasswordSourceFile;
 	StaticString adminPanelUrlSourceFile;
 	StaticString adminPanelUsernameSourceFile;
+	StaticString anonymousTelemetryProxySourceFile;
 	StaticString dataBufferDirSourceFile;
 	StaticString defaultGroupSourceFile;
 	StaticString defaultRubySourceFile;
@@ -197,6 +209,7 @@ struct AutoGeneratedServerConfig {
 	StaticString securityUpdateCheckProxySourceFile;
 	StaticString prestartURLsSourceFile;
 
+	unsigned int disableAnonymousTelemetrySourceLine;
 	unsigned int disableSecurityUpdateCheckSourceLine;
 	unsigned int showVersionInHeaderSourceLine;
 	unsigned int turbocachingSourceLine;
@@ -212,6 +225,7 @@ struct AutoGeneratedServerConfig {
 	unsigned int adminPanelPasswordSourceLine;
 	unsigned int adminPanelUrlSourceLine;
 	unsigned int adminPanelUsernameSourceLine;
+	unsigned int anonymousTelemetryProxySourceLine;
 	unsigned int dataBufferDirSourceLine;
 	unsigned int defaultGroupSourceLine;
 	unsigned int defaultRubySourceLine;
@@ -224,6 +238,7 @@ struct AutoGeneratedServerConfig {
 	unsigned int securityUpdateCheckProxySourceLine;
 	unsigned int prestartURLsSourceLine;
 
+	bool disableAnonymousTelemetryExplicitlySet: 1;
 	bool disableSecurityUpdateCheckExplicitlySet: 1;
 	bool showVersionInHeaderExplicitlySet: 1;
 	bool turbocachingExplicitlySet: 1;
@@ -239,6 +254,7 @@ struct AutoGeneratedServerConfig {
 	bool adminPanelPasswordExplicitlySet: 1;
 	bool adminPanelUrlExplicitlySet: 1;
 	bool adminPanelUsernameExplicitlySet: 1;
+	bool anonymousTelemetryProxyExplicitlySet: 1;
 	bool dataBufferDirExplicitlySet: 1;
 	bool defaultGroupExplicitlySet: 1;
 	bool defaultRubyExplicitlySet: 1;
@@ -253,6 +269,7 @@ struct AutoGeneratedServerConfig {
 
 
 	AutoGeneratedServerConfig() {
+		disableAnonymousTelemetry = false;
 		disableSecurityUpdateCheck = false;
 		showVersionInHeader = true;
 		turbocaching = true;
@@ -276,6 +293,9 @@ struct AutoGeneratedServerConfig {
 		/*
 		 * adminPanelUsername: default initialized
 		 */
+		/*
+		 * anonymousTelemetryProxy: default initialized
+		 */
 		/*
 		 * dataBufferDir: default initialized
 		 */
@@ -306,6 +326,7 @@ struct AutoGeneratedServerConfig {
 		 * prestartURLs: default initialized
 		 */
 
+		disableAnonymousTelemetrySourceLine = 0;
 		disableSecurityUpdateCheckSourceLine = 0;
 		showVersionInHeaderSourceLine = 0;
 		turbocachingSourceLine = 0;
@@ -321,6 +342,7 @@ struct AutoGeneratedServerConfig {
 		adminPanelPasswordSourceLine = 0;
 		adminPanelUrlSourceLine = 0;
 		adminPanelUsernameSourceLine = 0;
+		anonymousTelemetryProxySourceLine = 0;
 		dataBufferDirSourceLine = 0;
 		defaultGroupSourceLine = 0;
 		defaultRubySourceLine = 0;
@@ -333,6 +355,7 @@ struct AutoGeneratedServerConfig {
 		securityUpdateCheckProxySourceLine = 0;
 		prestartURLsSourceLine = 0;
 
+		disableAnonymousTelemetryExplicitlySet = false;
 		disableSecurityUpdateCheckExplicitlySet = false;
 		showVersionInHeaderExplicitlySet = false;
 		turbocachingExplicitlySet = false;
@@ -348,6 +371,7 @@ struct AutoGeneratedServerConfig {
 		adminPanelPasswordExplicitlySet = false;
 		adminPanelUrlExplicitlySet = false;
 		adminPanelUsernameExplicitlySet = false;
+		anonymousTelemetryProxyExplicitlySet = false;
 		dataBufferDirExplicitlySet = false;
 		defaultGroupExplicitlySet = false;
 		defaultRubyExplicitlySet = false;