diff options
| author | Liam Mitchell <[email protected]> | 2026-01-14 15:34:57 -0800 |
|---|---|---|
| committer | Liam Mitchell <[email protected]> | 2026-01-14 15:36:09 -0800 |
| commit | e44934cf1b4783420f5a4c6acbdbac44488d92a9 (patch) | |
| tree | 54514f3878421108ce26a1f88eafda95aa90f6aa /src/zenserver/zenserver.cpp | |
| parent | added early-out check in GcManager::ScrubStorage(ScrubContext& GcCtx) (#698) (diff) | |
| download | zen-e44934cf1b4783420f5a4c6acbdbac44488d92a9.tar.xz zen-e44934cf1b4783420f5a4c6acbdbac44488d92a9.zip | |
Use well-known OidcToken paths or command line arguments to determine OidcToken executable path
Diffstat (limited to 'src/zenserver/zenserver.cpp')
| -rw-r--r-- | src/zenserver/zenserver.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp index ab8dbb16b..d5c9558aa 100644 --- a/src/zenserver/zenserver.cpp +++ b/src/zenserver/zenserver.cpp @@ -24,6 +24,7 @@ #include <zencore/workthreadpool.h> #include <zenhttp/httpserver.h> #include <zentelemetry/otlptrace.h> +#include <zenutil/authutils.h> #include <zenutil/service.h> #include <zenutil/workerpools.h> #include <zenutil/zenserverprocess.h> @@ -127,6 +128,11 @@ ZenServerBase::Initialize(const ZenServerConfig& ServerOptions, ZenServerState:: EnqueueSigIntTimer(); + if (!ServerOptions.OidcTokenExecutable.empty()) + { + SetEnvVariable(std::string(GetOidcTokenPathEnvVariableName()), ServerOptions.OidcTokenExecutable.string()); + } + m_Http = CreateHttpServer(ServerOptions.HttpConfig); int EffectiveBasePort = m_Http->Initialize(ServerOptions.BasePort, ServerOptions.DataDir); if (EffectiveBasePort == 0) |