From 8550a6c6bbd9f5b4cda6067f7f519eee1f59ad17 Mon Sep 17 00:00:00 2001
From: Kory Draughn <korydraughn@renci.org>
Date: Fri, 18 Oct 2024 09:05:08 -0400
Subject: [PATCH] squash. json schema reordering and TODO for default path for
 main server pid.

---
 schemas/configuration/v4/server_config.json | 15 +++++++++------
 server/main_server/src/main.cpp             |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/schemas/configuration/v4/server_config.json b/schemas/configuration/v4/server_config.json
index 4ed62e8ccb..749dc7005c 100644
--- a/schemas/configuration/v4/server_config.json
+++ b/schemas/configuration/v4/server_config.json
@@ -3,19 +3,22 @@
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "type": "object",
     "properties": {
-        "ips_data_directory": {"type": "string"},
-        "stacktrace_directory": {"type": "string"},
         "json_schema_file": {"type": "string"},
         "environment_json_schema_file": {"type": "string"},
+
+        "ips_data_directory": {"type": "string"},
+        "stacktrace_directory": {"type": "string"},
+
+        "msiExecCmd_bin_directory": {"type": "string"},
+        "plugin_directory": {"type": "string"},
+        "home_directory": {"type": "string"},
+        "version_file": {"type": "string"},
+
         "graceful_shutdown_timeout_in_seconds": {
             "type": "integer",
             "minimum": 0,
             "default": 30
         },
-        "msiExecCmd_bin_directory": {"type": "string"},
-        "plugin_directory": {"type": "string"},
-        "home_directory": {"type": "string"},
-        "version_file": {"type": "string"},
 
         "directories": {
             "type": "object",
diff --git a/server/main_server/src/main.cpp b/server/main_server/src/main.cpp
index 0524425f84..e4c21149d4 100644
--- a/server/main_server/src/main.cpp
+++ b/server/main_server/src/main.cpp
@@ -175,7 +175,7 @@ int main(int _argc, char* _argv[])
         // Perhaps daemonization means there's only one instance running on the machine?
         // What if the pidfile name was derived from the config file path? Only one instance can work.
         // But, what if server redirection is disabled by the admin?
-        std::string pid_file = "/var/run/irods.pid";
+        std::string pid_file = "/var/run/irods.pid"; // TODO Derive from default root path.
         if (const auto iter = vm.find("pid-file"); std::end(vm) != iter) {
             pid_file = std::move(iter->second.as<std::string>());
         }