diff options
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/config.cpp | 7 | ||||
| -rw-r--r-- | zenserver/config.h | 1 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 13 |
3 files changed, 20 insertions, 1 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp index 457a91e49..91fb80747 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -188,6 +188,13 @@ ParseGlobalCliOptions(int argc, char* argv[], ZenServerOptions& GlobalOptions, Z options.add_option("cache", "", + "upstream-jupiter-prod", + "Enable Jupiter upstream caching using production settings", + cxxopts::value<bool>(ServiceConfig.UpstreamCacheConfig.JupiterConfig.UseProductionSettings)->default_value("false"), + ""); + + options.add_option("cache", + "", "upstream-jupiter-dev", "Enable Jupiter upstream caching using development settings", cxxopts::value<bool>(ServiceConfig.UpstreamCacheConfig.JupiterConfig.UseDevelopmentSettings)->default_value("false"), diff --git a/zenserver/config.h b/zenserver/config.h index c9aa06284..ce059bdb2 100644 --- a/zenserver/config.h +++ b/zenserver/config.h @@ -28,6 +28,7 @@ struct ZenUpstreamJupiterConfig std::string Namespace; std::string DdcNamespace; bool UseDevelopmentSettings = false; + bool UseProductionSettings = false; bool UseLegacyDdc = false; }; diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 7538c090f..fe4f41ab5 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -200,7 +200,18 @@ public: { zen::CloudCacheClientOptions Options; - if (UpstreamConfig.JupiterConfig.UseDevelopmentSettings) + if (UpstreamConfig.JupiterConfig.UseProductionSettings) + { + Options = zen::CloudCacheClientOptions{ + .ServiceUrl = "https://jupiter.devtools.epicgames.com"sv, + .DdcNamespace = "ue.ddc"sv, + .BlobStoreNamespace = "ue.ddc"sv, + .OAuthProvider = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv, + .OAuthClientId = "0oao91lrhqPiAlaGD0x7"sv, + .OAuthSecret = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv, + .UseLegacyDdc = false}; + } + else if (UpstreamConfig.JupiterConfig.UseDevelopmentSettings) { Options = zen::CloudCacheClientOptions{ .ServiceUrl = "https://jupiter.devtools-dev.epicgames.com"sv, |