mirror of https://github.com/oxen-io/lokinet
Share common conf comments for client and relay
This commit is contained in:
parent
3739fc1d70
commit
1fc7c61d1f
|
@ -211,7 +211,7 @@ main(int argc, char* argv[])
|
|||
if (genconfigOnly)
|
||||
{
|
||||
llarp::ensureConfig(llarp::GetDefaultDataDir(),
|
||||
llarp::GetDefaultConfigFilename(),
|
||||
llarp::GetDefaultConfigPath(),
|
||||
overwrite,
|
||||
opts.isRelay);
|
||||
}
|
||||
|
@ -246,7 +246,7 @@ main(int argc, char* argv[])
|
|||
}
|
||||
|
||||
llarp::ensureConfig(llarp::GetDefaultDataDir(),
|
||||
llarp::GetDefaultConfigFilename(),
|
||||
llarp::GetDefaultConfigPath(),
|
||||
overwrite,
|
||||
opts.isRelay);
|
||||
conffname = llarp::GetDefaultConfigPath().c_str();
|
||||
|
|
|
@ -547,15 +547,9 @@ namespace llarp
|
|||
llarp::LogInfo("Generated new config ", confFile);
|
||||
}
|
||||
|
||||
std::string
|
||||
Config::generateBaseClientConfig(fs::path defaultDataDir)
|
||||
void
|
||||
generateCommonConfigComments(ConfigDefinition& def)
|
||||
{
|
||||
ConfigGenParameters params;
|
||||
params.isRelay = false;
|
||||
params.defaultDataDir = std::move(defaultDataDir);
|
||||
|
||||
llarp::ConfigDefinition def;
|
||||
initializeConfig(def, params);
|
||||
|
||||
// router
|
||||
def.addSectionComments("router", {
|
||||
|
@ -682,6 +676,18 @@ namespace llarp
|
|||
def.addOptionComments("network", "ifaddr", {
|
||||
"Local IP address for lokinet traffic.",
|
||||
});
|
||||
}
|
||||
|
||||
std::string
|
||||
Config::generateBaseClientConfig(fs::path defaultDataDir)
|
||||
{
|
||||
ConfigGenParameters params;
|
||||
params.isRelay = false;
|
||||
params.defaultDataDir = std::move(defaultDataDir);
|
||||
|
||||
llarp::ConfigDefinition def;
|
||||
initializeConfig(def, params);
|
||||
generateCommonConfigComments(def);
|
||||
|
||||
// snapp
|
||||
def.addSectionComments("snapp", {
|
||||
|
@ -743,6 +749,7 @@ namespace llarp
|
|||
|
||||
llarp::ConfigDefinition def;
|
||||
initializeConfig(def, params);
|
||||
generateCommonConfigComments(def);
|
||||
|
||||
// lokid
|
||||
def.addSectionComments("lokid", {
|
||||
|
|
Loading…
Reference in New Issue