tweak configuration defaults

llarp/config/config.cpp

@@ -36,7 +36,6 @@ namespace llarp
     constexpr int DefaultWorkerThreads = 1;
     constexpr int DefaultNetThreads = 1;
     constexpr bool DefaultBlockBogons = true;
-    constexpr bool DefaultEnablePeerStats = true;
 
     conf.defineOption<int>("router", "job-queue-size", false, DefaultJobQueueSize, [this](int arg) {
       if (arg < 1024)
@@ -134,7 +133,7 @@ namespace llarp
         "router",
         "enable-peer-stats",
         false,
-        DefaultEnablePeerStats,
+        params.isRelay,
         AssignmentAcceptor(m_enablePeerStats));
     m_isRelay = params.isRelay;
   }
@@ -478,7 +477,6 @@ namespace llarp
   {
     (void)params;
 
-    constexpr bool DefaultWhitelistRouters = false;
     constexpr auto DefaultLokidRPCAddr = "tcp://127.0.0.1:22023";
 
     conf.defineOption<std::string>(
@@ -491,7 +489,7 @@ namespace llarp
         });
 
     conf.defineOption<bool>(
-        "lokid", "enabled", false, DefaultWhitelistRouters, AssignmentAcceptor(whitelistRouters));
+        "lokid", "enabled", false, params.isRelay, AssignmentAcceptor(whitelistRouters));
 
     conf.defineOption<std::string>("lokid", "jsonrpc", false, "", [](std::string arg) {
       if (arg.empty())

llarp/config/key_manager.cpp

@@ -18,7 +18,7 @@ namespace llarp
     if (m_initialized)
       return false;
 
-    fs::path root = config.router.m_dataDir;
+    const fs::path root = config.router.m_dataDir;
 
     // utility function to assign a path, using the specified config parameter if present and
     // falling back to root / defaultName if not
@@ -31,7 +31,7 @@ namespace llarp
       {
         fs::path file(option);
         if (not file.is_absolute())
-          throw std::runtime_error(stringify("override for ", defaultName, " cannot be relative"));
+          file = root / file;
 
         return file;
       }