1 files changed, 21 insertions, 45 deletions

diff --git a/src/zenserver/config.h b/src/zenserver/config.h
index ee57b23cc..d3b20218f 100644
--- a/src/zenserver/config.h
+++ b/src/zenserver/config.h
@@ -23,27 +23,6 @@ struct ZenUpstreamJupiterConfig
 	std::string DdcNamespace;
 };
 
-struct ZenUpstreamHordeConfig
-{
-	std::string Name;
-	std::string Url;
-	std::string OAuthUrl;
-	std::string OAuthClientId;
-	std::string OAuthClientSecret;
-	std::string OpenIdProvider;
-	std::string AccessToken;
-
-	std::string StorageUrl;
-	std::string StorageOAuthUrl;
-	std::string StorageOAuthClientId;
-	std::string StorageOAuthClientSecret;
-	std::string StorageOpenIdProvider;
-	std::string StorageAccessToken;
-
-	std::string Cluster;
-	std::string Namespace;
-};
-
 struct ZenUpstreamZenConfig
 {
 	std::string				 Name;
@@ -62,7 +41,6 @@ enum class UpstreamCachePolicy : uint8_t
 struct ZenUpstreamCacheConfig
 {
 	ZenUpstreamJupiterConfig JupiterConfig;
-	ZenUpstreamHordeConfig	 HordeConfig;
 	ZenUpstreamZenConfig	 ZenConfig;
 	int32_t					 UpstreamThreadCount		= 4;
 	int32_t					 ConnectTimeoutMilliseconds = 5000;
@@ -137,29 +115,27 @@ struct ZenServerOptions
 	ZenObjectStoreConfig	 ObjectStoreConfig;
 	zen::HttpServerConfig	 HttpServerConfig;
 	ZenStructuredCacheConfig StructuredCacheConfig;
-	std::filesystem::path	 DataDir;						 // Root directory for state (used for testing)
-	std::filesystem::path	 ContentDir;					 // Root directory for serving frontend content (experimental)
-	std::filesystem::path	 AbsLogFile;					 // Absolute path to main log file
-	std::filesystem::path	 ConfigFile;					 // Path to Lua config file
-	std::string				 ChildId;						 // Id assigned by parent process (used for lifetime management)
-	std::string				 LogId;							 // Id for tagging log output
-	std::string				 EncryptionKey;					 // 256 bit AES encryption key
-	std::string				 EncryptionIV;					 // 128 bit AES initialization vector
-	int						 BasePort			   = 1337;	 // Service listen port (used for both UDP and TCP)
-	int						 OwnerPid			   = 0;		 // Parent process id (zero for standalone)
-	bool					 InstallService		   = false;	 // Flag used to initiate service install (temporary)
-	bool					 UninstallService	   = false;	 // Flag used to initiate service uninstall (temporary)
-	bool					 IsDebug			   = false;
-	bool					 IsTest				   = false;
-	bool					 IsDedicated		   = false;	 // Indicates a dedicated/shared instance, with larger resource requirements
-	bool					 ExecServiceEnabled	   = true;
-	bool					 ComputeServiceEnabled = true;
-	bool					 ShouldCrash		   = false;	 // Option for testing crash handling
-	bool					 IsFirstRun			   = false;
-	bool					 NoSentry			   = false;
-	bool					 SentryAllowPII		   = false;	 // Allow personally identifiable information in sentry crash reports
-	bool					 ObjectStoreEnabled	   = false;
-	bool					 NoConsoleOutput	   = false;	 // Control default use of stdout for diagnostics
+	std::filesystem::path	 DataDir;					  // Root directory for state (used for testing)
+	std::filesystem::path	 ContentDir;				  // Root directory for serving frontend content (experimental)
+	std::filesystem::path	 AbsLogFile;				  // Absolute path to main log file
+	std::filesystem::path	 ConfigFile;				  // Path to Lua config file
+	std::string				 ChildId;					  // Id assigned by parent process (used for lifetime management)
+	std::string				 LogId;						  // Id for tagging log output
+	std::string				 EncryptionKey;				  // 256 bit AES encryption key
+	std::string				 EncryptionIV;				  // 128 bit AES initialization vector
+	int						 BasePort			= 1337;	  // Service listen port (used for both UDP and TCP)
+	int						 OwnerPid			= 0;	  // Parent process id (zero for standalone)
+	bool					 InstallService		= false;  // Flag used to initiate service install (temporary)
+	bool					 UninstallService	= false;  // Flag used to initiate service uninstall (temporary)
+	bool					 IsDebug			= false;
+	bool					 IsTest				= false;
+	bool					 IsDedicated		= false;  // Indicates a dedicated/shared instance, with larger resource requirements
+	bool					 ShouldCrash		= false;  // Option for testing crash handling
+	bool					 IsFirstRun			= false;
+	bool					 NoSentry			= false;
+	bool					 SentryAllowPII		= false;  // Allow personally identifiable information in sentry crash reports
+	bool					 ObjectStoreEnabled = false;
+	bool					 NoConsoleOutput	= false;  // Control default use of stdout for diagnostics
 #if ZEN_WITH_TRACE
 	std::string TraceHost;	// Host name or IP address to send trace data to
 	std::string TraceFile;	// Path of a file to write a trace