passenger 5.3.4 → 6.0.1

data/src/agent/Shared/Fundamentals/AbortHandler.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.
@@ -26,6 +26,8 @@
 #ifndef _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 #define _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 
+#include <cstddef>
+
 namespace Passenger {
 	class ResourceLocator;
 }
@@ -36,7 +38,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 +63,17 @@ struct AbortHandlerConfig {
 	bool beep;
 	bool stopProcess;
 	ResourceLocator *resourceLocator;
-	DiagnosticsDumper diagnosticsDumper;
-	void *diagnosticsDumperUserData;
+	DiagnosticsDumper diagnosticsDumpers[MAX_DIAGNOSTICS_DUMPERS];
+
+	AbortHandlerConfig()
+		: ruby(NULL),
+		  origArgv(NULL),
+		  randomSeed(0),
+		  dumpWithCrashWatch(false),
+		  beep(false),
+		  stopProcess(false),
+		  resourceLocator(NULL)
+		{ }
 };
 
 void installAbortHandler(const AbortHandlerConfig *config);

data/src/agent/Shared/Fundamentals/Initialization.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.
@@ -50,9 +50,9 @@
 #include <ResourceLocator.h>
 #include <LoggingKit/LoggingKit.h>
 #include <LoggingKit/Context.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/MessageIO.h>
-#include <Utils/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/MessageIO.h>
+#include <SystemTools/SystemTime.h>
 
 
 namespace Passenger {
@@ -559,7 +559,6 @@ initializeAgent(int argc, char **argv[], const char *processName,
 	const char *seedStr;
 
 	context = new Context();
-	memset(context, 0, sizeof(Context));
 
 	seedStr = getEnvString("PASSENGER_RANDOM_SEED");
 	if (seedStr == NULL) {

data/src/agent/Shared/Fundamentals/Initialization.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.
@@ -47,6 +47,14 @@ struct Context {
 	char **origArgv;
 	bool feedbackFdAvailable;
 	AbortHandlerConfig abortHandlerConfig;
+
+	Context()
+		: resourceLocator(NULL),
+		  randomSeed(0),
+		  origArgc(0),
+		  origArgv(NULL),
+		  feedbackFdAvailable(false)
+		{ }
 };
 
 typedef void (*OptionParserFunc)(int argc, const char **argv, ConfigKit::Store &config);

data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

@@ -64,7 +64,7 @@
 #include <FileTools/PathManip.h>
 #include <SystemTools/UserDatabase.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Handshake/WorkDir.h>
 #include <Core/SpawningKit/Exceptions.h>
 

data/src/agent/SystemMetrics/SystemMetricsMain.cpp

@@ -1,6 +1,6 @@
 /*
  *  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.
@@ -28,9 +28,10 @@
 #include <unistd.h>
 #include <cstdio>
 #include <cstring>
+
+#include <SystemTools/SystemMetricsCollector.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemMetricsCollector.h>
+#include <StrIntTools/StrIntUtils.h>
 
 using namespace std;
 using namespace Passenger;

data/src/agent/TempDirToucher/TempDirToucherMain.cpp

@@ -1,6 +1,6 @@
 /*
  *  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.
@@ -361,7 +361,7 @@ touchDir(const char *dir) {
 		}
 		execlp("/bin/sh", "/bin/sh", "-c",
 			"find \"$1\" | xargs touch", "/bin/sh", ".",
-			(const char * const) 0);
+			(char *) 0);
 		e = errno;
 		fprintf(stderr, ERROR_PREFIX ": cannot execute /bin/sh: %s (errno %d)\n",
 			strerror(e), e);
@@ -432,7 +432,7 @@ performCleanup(const char *dir) {
 		close(terminationPipe[1]);
 		execlp("/bin/sh", "/bin/sh", "-c",
 			"rm -rf \"$1\"", "/bin/sh", dir,
-			(const char * const) 0);
+			(char *) 0);
 		e = errno;
 		fprintf(stderr, ERROR_PREFIX ": cannot execute /bin/sh: %s (errno %d)\n",
 			strerror(e), e);

data/src/agent/Watchdog/ApiServer.h

@@ -1,6 +1,6 @@
 /*
  *  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.
@@ -40,8 +40,8 @@
 #include <StaticString.h>
 #include <LoggingKit/LoggingKit.h>
 #include <Constants.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/MessageIO.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/MessageIO.h>
 
 namespace Passenger {
 namespace Watchdog {

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.
@@ -33,7 +33,7 @@
 #include <Watchdog/ApiServer.h>
 #include <Shared/ApiAccountUtils.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace Watchdog {
@@ -146,15 +146,27 @@ 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/6.0.1")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only
+ *   single_app_mode_app_start_command                                        string             -          read_only
  *   single_app_mode_app_type                                                 string             -          read_only
  *   single_app_mode_startup_file                                             string             -          read_only
  *   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 +265,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 +282,9 @@ public:
 		ConfigKit::PrefixTranslator translator;
 	} apiServerKit;
 
-	Schema() {
+	Schema(const WrapperRegistry::Registry *wrapperRegistry = NULL)
+		: core(wrapperRegistry)
+	{
 		using namespace ConfigKit;
 
 		// Add subschema: core
@@ -279,6 +297,7 @@ public:
 		core.translator.finalize();
 		addSubSchema(core.schema, core.translator);
 		erase("instance_dir");
+		erase("oom_score");
 		erase("watchdog_fd_passing_password");
 		/***********/
 		/***********/

data/src/agent/Watchdog/CoreWatcher.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.
@@ -25,7 +25,7 @@
  */
 
 #include <Shared/Fundamentals/Utils.h>
-#include <Utils/MessageIO.h>
+#include <IOTools/MessageIO.h>
 
 class CoreWatcher: public AgentWatcher {
 protected:

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -73,18 +73,19 @@
 #include <FileDescriptor.h>
 #include <FileTools/PathSecurityCheck.h>
 #include <SystemTools/UserDatabase.h>
+#include <SystemTools/ContainerHelpers.h>
 #include <RandomGenerator.h>
 #include <BackgroundEventLoop.h>
 #include <LoggingKit/LoggingKit.h>
 #include <Exceptions.h>
 #include <StaticString.h>
 #include <Hooks.h>
+#include <IOTools/IOUtils.h>
+#include <IOTools/MessageIO.h>
 #include <Utils.h>
 #include <Utils/Timer.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/MessageIO.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Utils/OptionParsing.h>
 #include <Utils/VariantMap.h>
 
@@ -165,6 +166,7 @@ namespace Watchdog {
 
 using namespace Passenger::Watchdog;
 
+static WrapperRegistry::Registry *watchdogWrapperRegistry;
 static Schema *watchdogSchema;
 static ConfigKit::Store *watchdogConfig;
 static WorkingObjects *workingObjects;
@@ -179,8 +181,22 @@ static void cleanup(const WorkingObjectsPtr &wo);
 /***** Functions *****/
 
 #if !BOOST_OS_MACOS
+
+struct WatchdogOomAdjustResult {
+	struct Message {
+		LoggingKit::Level level;
+		string text;
+	};
+
+	string oldScore;
+	// LoggingKit has not been initialized yet when setOomScoreNeverKill()
+	// is called, so we store the messages here and print them after
+	// LoggingKit initialization.
+	vector<Message> messages;
+};
+
 static FILE *
-openOomAdjFileGetType(const char *mode, OomFileType &type) {
+openOomAdjFileGetType(const char *mode, OomFileType &type, string &path) {
 	FILE *f = fopen("/proc/self/oom_score_adj", mode);
 	if (f == NULL) {
 		f = fopen("/proc/self/oom_adj", mode);
@@ -188,40 +204,46 @@ openOomAdjFileGetType(const char *mode, OomFileType &type) {
 			return NULL;
 		} else {
 			type = OOM_ADJ;
+			path = "/proc/self/oom_adj";
 			return f;
 		}
 	} else {
 		type = OOM_SCORE_ADJ;
+		path = "/proc/self/oom_score_adj";
 		return f;
 	}
 }
 
-static FILE *
-openOomAdjFileForcedType(const char *mode, OomFileType &type) {
-	if (type == OOM_SCORE_ADJ) {
-		return fopen("/proc/self/oom_score_adj", mode);
-	} else {
-		assert(type == OOM_ADJ);
-		return fopen("/proc/self/oom_adj", mode);
-	}
-}
-
 /**
  * Set the current process's OOM score to "never kill".
  */
-static string
+static WatchdogOomAdjustResult
 setOomScoreNeverKill() {
-	string oldScore;
+	WatchdogOomAdjustResult result;
 	FILE *f;
+	string path;
 	OomFileType type;
+	int e;
+
+	if (geteuid() != 0) {
+		WatchdogOomAdjustResult::Message msg;
+		msg.level = LoggingKit::DEBUG;
+		msg.text = "Not adjusting Watchdog's OOM score because not running with root privileges";
+		result.messages.push_back(msg);
+		return result;
+	}
 
-	f = openOomAdjFileGetType("r", type);
+	f = openOomAdjFileGetType("r", type, path);
 	if (f == NULL) {
-		return "";
+		e = errno;
+		P_ERROR("Error adjusting Watchdog's OOM score: error opening both"
+			" /proc/self/oom_score_adj and /proc/self/oom_adj for reading: " <<
+			strerror(e) << " (errno=" << e << ")");
+		return result;
 	}
 	// mark if this is a legacy score so we won't try to write it as OOM_SCORE_ADJ
 	if (type == OOM_ADJ) {
-		oldScore.append("l");
+		result.oldScore.append("l");
 	}
 	char buf[1024];
 	size_t bytesRead;
@@ -230,17 +252,27 @@ setOomScoreNeverKill() {
 		if (bytesRead == 0 && feof(f)) {
 			break;
 		} else if (bytesRead == 0 && ferror(f)) {
+			P_ERROR("Error adjusting Watchdog's OOM score: error reading " << path);
 			fclose(f);
-			return "";
+			result.oldScore.clear();
+			return result;
 		} else {
-			oldScore.append(buf, bytesRead);
+			result.oldScore.append(buf, bytesRead);
 		}
 	}
 	fclose(f);
 
-	f = openOomAdjFileForcedType("w", type);
+	f = fopen(path.c_str(), "w");
 	if (f == NULL) {
-		return "";
+		e = errno;
+		WatchdogOomAdjustResult::Message msg;
+		msg.level = LoggingKit::ERROR;
+		msg.text = "Error adjusting Watchdog's OOM score: error opening "
+			+ path + " for writing: " + strerror(e) + " (errno="
+			+ toString(e) + ")";
+		result.messages.push_back(msg);
+		result.oldScore.clear();
+		return result;
 	}
 	if (type == OOM_SCORE_ADJ) {
 		fprintf(f, "-1000\n");
@@ -248,10 +280,44 @@ setOomScoreNeverKill() {
 		assert(type == OOM_ADJ);
 		fprintf(f, "-17\n");
 	}
-	fclose(f);
 
-	return oldScore;
+	e = fflush(f);
+	if (e != 0) {
+		e = errno;
+		WatchdogOomAdjustResult::Message msg;
+		if (autoDetectInContainer()) {
+			msg.level = LoggingKit::INFO;
+			msg.text = "Running in container, so couldn't adjust Watchdog's"
+				" OOM score through " + path;
+		} else {
+			msg.level = LoggingKit::ERROR;
+			msg.text = "Error adjusting Watchdog's OOM score: error writing to "
+				+ path + ": " + strerror(e) + " (errno=" + toString(e) + ")";
+		}
+		result.messages.push_back(msg);
+	}
+	e = fclose(f);
+	if (e == EOF) {
+		e = errno;
+		WatchdogOomAdjustResult::Message msg;
+		msg.level = LoggingKit::ERROR;
+		msg.text = "Error adjusting Watchdog's OOM score: error closing "
+			+ path + ": " + strerror(e) + " (errno=" + toString(e) + ")";
+		result.messages.push_back(msg);
+	}
+
+	return result;
+}
+
+static void
+printOomAdjustResultMessages(const WatchdogOomAdjustResult &result) {
+	vector<WatchdogOomAdjustResult::Message>::const_iterator it;
+
+	for (it = result.messages.begin(); it != result.messages.end(); it++) {
+		P_LOG(LoggingKit::context, it->level, __FILE__, __LINE__, it->text);
+	}
 }
+
 #endif
 
 static void
@@ -797,10 +863,12 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	 * so we need to restore it after each fork().
 	 */
 #if !BOOST_OS_MACOS
-	string oldOomScore = setOomScoreNeverKill();
+	WatchdogOomAdjustResult oomAdjustResult = 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,
@@ -812,7 +880,8 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	wo = boost::make_shared<WorkingObjects>();
 	workingObjects = wo.get();
 #if !BOOST_OS_MACOS
-	wo->extraConfigToPassToSubAgents["oom_score"] = oldOomScore;
+	printOomAdjustResultMessages(oomAdjustResult);
+	wo->extraConfigToPassToSubAgents["oom_score"] = oomAdjustResult.oldScore;
 #endif
 }
 

data/src/apache2_module/Config.cpp

@@ -40,12 +40,6 @@
 #include <ap_config.h>
 #undef AP_HAVE_DESIGNATED_INITIALIZER
 
-#include "Config.h"
-#include "ConfigGeneral/SetterFuncs.h"
-#include "ConfigGeneral/ManifestGeneration.h"
-#include "DirConfig/AutoGeneratedCreateFunction.cpp"
-#include "DirConfig/AutoGeneratedMergeFunction.cpp"
-#include "Utils.h"
 #include <JsonTools/Autocast.h>
 #include <SystemTools/UserDatabase.h>
 #include <Utils.h>
@@ -56,9 +50,17 @@
 #include <apr_strings.h>
 // In Apache < 2.4, this macro was necessary for core_dir_config and other structs
 #define CORE_PRIVATE
-#include <http_core.h>
+#include <httpd.h>
 #include <http_config.h>
 #include <http_log.h>
+#include <http_core.h>
+
+#include "Config.h"
+#include "ConfigGeneral/SetterFuncs.h"
+#include "ConfigGeneral/ManifestGeneration.h"
+#include "DirConfig/AutoGeneratedCreateFunction.cpp"
+#include "DirConfig/AutoGeneratedMergeFunction.cpp"
+#include "Utils.h"
 
 
 extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
@@ -72,6 +74,9 @@ extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
 #endif
 
 
+#include "ConfigGeneral/AutoGeneratedSetterFuncs.cpp"
+
+
 namespace Passenger {
 namespace Apache2Module {
 
@@ -174,8 +179,6 @@ postprocessConfig(server_rec *s, apr_pool_t *pool, apr_pool_t *temp_pool) {
  * Passenger settings
  *************************************************/
 
-#include "ConfigGeneral/AutoGeneratedSetterFuncs.cpp"
-
 static const char *
 cmd_passenger_enterprise_only(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return "this feature is only available in Phusion Passenger Enterprise. "
@@ -246,11 +249,8 @@ cmd_passenger_base_uri(cmd_parms *cmd, void *pcfg, const char *arg) {
 	}
 }
 
-extern "C" const command_rec passenger_commands[] = {
-	#include "ConfigGeneral/AutoGeneratedDefinitions.cpp"
-	{ NULL }
-};
-
 
 } // namespace Apache2Module
 } // namespace Passenger
+
+#include "ConfigGeneral/AutoGeneratedDefinitions.cpp"

data/src/apache2_module/Config.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.
@@ -40,28 +40,22 @@
 #include <apr_pools.h>
 #include <apr_strings.h>
 
+#include "ConfigGeneral/Common.h"
+#include "DirConfig/AutoGeneratedStruct.h"
+#include "ServerConfig/AutoGeneratedStruct.h"
+
 namespace Passenger {
 namespace Apache2Module {
 
 using namespace std;
 
 
-enum Threeway {
-	UNSET = -1,
-	DISABLED = 0,
-	ENABLED = 1
-};
-
-#define UNSET_INT_VALUE INT_MIN
-
 /**
- * Per-directory configuration information.
+ * Per-directory configuration information (manually-written part).
  *
  * Use the getter methods to query information, because those will return
  * the default value if the value is not specified.
  */
-#include "DirConfig/AutoGeneratedStruct.h"
-
 struct DirConfig: public AutoGeneratedDirConfig {
 
 	/*************************************/
@@ -72,14 +66,12 @@ struct DirConfig: public AutoGeneratedDirConfig {
 
 
 /**
- * Server-wide (global, not per-virtual host) configuration information.
+ * Server-wide (global, not per-virtual host) configuration information
+ * (manually written part).
  *
  * Use the getter methods to query information, because those will return
  * the default value if the value is not specified.
  */
-
-#include "ServerConfig/AutoGeneratedStruct.h"
-
 struct ServerConfig: public AutoGeneratedServerConfig {
 	Json::Value manifest;