squash. json schema reordering and TODO for default path for main ser…

…ver pid.

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",

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>());
         }