diff options
| author | Liam Mitchell <[email protected]> | 2026-01-15 17:08:03 -0800 |
|---|---|---|
| committer | Liam Mitchell <[email protected]> | 2026-01-15 17:08:03 -0800 |
| commit | 95d1bf56a77ecbd158e828592110d57f5445ed5e (patch) | |
| tree | c3416397ac8d6bb448044f31d0b66b581aadce1d /src/zenserver/config/config.cpp | |
| parent | Use well-known OidcToken paths or command line arguments to determine OidcTok... (diff) | |
| download | zen-lm/oidctoken-exe-path.tar.xz zen-lm/oidctoken-exe-path.zip | |
Pass command-line OidcToken option through config rather than env variables, and add lua optionlm/oidctoken-exe-path
Diffstat (limited to 'src/zenserver/config/config.cpp')
| -rw-r--r-- | src/zenserver/config/config.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/zenserver/config/config.cpp b/src/zenserver/config/config.cpp index f5170add8..18187711b 100644 --- a/src/zenserver/config/config.cpp +++ b/src/zenserver/config/config.cpp @@ -182,7 +182,6 @@ struct ZenServerCmdLineOptions std::string DataDir; std::string AbsLogFile; std::string BaseSnapshotDir; - std::string OidcTokenExecutable; void AddCliOptions(cxxopts::Options& options, ZenServerConfig& ServerOptions); void ApplyOptions(cxxopts::Options& options, ZenServerConfig& ServerOptions); @@ -375,13 +374,6 @@ ZenServerCmdLineOptions::AddCliOptions(cxxopts::Options& options, ZenServerConfi "", cxxopts::value<bool>(ServerOptions.StatsConfig.Enabled)->default_value("false"), "Enable statsd reporter (localhost:8125)"); - - options.add_option("auth", - "", - "oidctoken-exe-path", - "Path to OidcToken executable", - cxxopts::value<std::string>(OidcTokenExecutable)->default_value(""), - ""); } void @@ -396,13 +388,12 @@ ZenServerCmdLineOptions::ApplyOptions(cxxopts::Options& options, ZenServerConfig throw std::runtime_error(fmt::format("'--snapshot-dir' ('{}') must be a directory", ServerOptions.BaseSnapshotDir)); } - ServerOptions.SystemRootDir = MakeSafeAbsolutePath(SystemRootDir); - ServerOptions.DataDir = MakeSafeAbsolutePath(DataDir); - ServerOptions.ContentDir = MakeSafeAbsolutePath(ContentDir); - ServerOptions.AbsLogFile = MakeSafeAbsolutePath(AbsLogFile); - ServerOptions.ConfigFile = MakeSafeAbsolutePath(ConfigFile); - ServerOptions.BaseSnapshotDir = MakeSafeAbsolutePath(BaseSnapshotDir); - ServerOptions.OidcTokenExecutable = MakeSafeAbsolutePath(OidcTokenExecutable); + ServerOptions.SystemRootDir = MakeSafeAbsolutePath(SystemRootDir); + ServerOptions.DataDir = MakeSafeAbsolutePath(DataDir); + ServerOptions.ContentDir = MakeSafeAbsolutePath(ContentDir); + ServerOptions.AbsLogFile = MakeSafeAbsolutePath(AbsLogFile); + ServerOptions.ConfigFile = MakeSafeAbsolutePath(ConfigFile); + ServerOptions.BaseSnapshotDir = MakeSafeAbsolutePath(BaseSnapshotDir); } ////////////////////////////////////////////////////////////////////////// |