Standardize config file section ordering, list operations in usage

Group config keys into sections separated by blank lines: identity,
encryption (certificate/privateKey/trustStore), security mode, auth.
Program-specific keys (cleanupTimeout, registerInterval) go last.
Show available operations in Client usage message.

4 files changed, 19 insertions, 14 deletions

diff --git a/config/client.conf b/config/client.conf
index 3f22038..dac9cb9 100644
--- a/config/client.conf
+++ b/config/client.conf
@@ -4,20 +4,23 @@
 #   applicationUri    OPC UA application URI
 #   certificate       Path to client certificate (.der)
 #   privateKey        Path to client private key (.der)
+#   trustStore        Directory containing trusted certificates (.der)
 #   securityMode      None, Sign, or SignAndEncrypt
 #   securityPolicy    None, Basic256Sha256, Aes256_Sha256_RsaPss,
 #                     Aes128_Sha256_RsaOaep, or ECC_nistP256
 #   authMode          "anonymous" or "user" (read-time only)
 #   username          Username (required when authMode = user)
 #   password          Password (required when authMode = user)
-#   trustStore        Directory containing trusted certificates (.der)
 
 applicationUri = urn:localhost:bobink:ClientFindServers
+
 certificate = certs/ClientFindServers_cert.der
 privateKey = certs/ClientFindServers_key.der
+trustStore = certs/trust/client
+
 securityMode = SignAndEncrypt
 securityPolicy = Aes256_Sha256_RsaPss
+
 authMode = user
 username = user
 password = password
-trustStore = certs/trust/client
diff --git a/config/server_lds.conf b/config/server_lds.conf
index 9ce5e9b..54e0457 100644
--- a/config/server_lds.conf
+++ b/config/server_lds.conf
@@ -5,20 +5,21 @@
 #   applicationUri    OPC UA application URI
 #   certificate       Path to server certificate (.der)
 #   privateKey        Path to server private key (.der)
-#   cleanupTimeout    Seconds before stale registrations are removed (must be > 10)
+#   trustStore        Directory containing trusted certificates (.der)
 #   authMode          "anonymous" or "user"
 #   username          Username (required when authMode = user)
 #   password          Password (required when authMode = user)
-#   trustStore        Directory containing trusted certificates (.der)
+#   cleanupTimeout    Seconds before stale registrations are removed (must be > 10)
 
 port = 4840
 applicationUri = urn:localhost:bobink:ServerLDS
+
 certificate = certs/ServerLDS_cert.der
 privateKey = certs/ServerLDS_key.der
-cleanupTimeout = 60
+trustStore = certs/trust/server_lds
 
 authMode = user
 username = user
 password = password
 
-trustStore = certs/trust/server_lds
+cleanupTimeout = 60
diff --git a/config/server_register.conf b/config/server_register.conf
index 1c3410d..b3f9290 100644
--- a/config/server_register.conf
+++ b/config/server_register.conf
@@ -5,21 +5,21 @@
 #   applicationUri    OPC UA application URI
 #   certificate       Path to server certificate (.der)
 #   privateKey        Path to server private key (.der)
-#   registerInterval  Seconds between re-registrations with the LDS
+#   trustStore        Directory containing trusted certificates (.der)
 #   authMode          "anonymous" or "user"
 #   username          Username (required when authMode = user)
 #   password          Password (required when authMode = user)
-#   trustStore        Directory containing trusted certificates (.der)
+#   registerInterval  Seconds between re-registrations with the LDS
 
 port = 4841
 applicationUri = urn:localhost:bobink:ServerRegister
+
 certificate = certs/ServerRegister_cert.der
 privateKey = certs/ServerRegister_key.der
-
-registerInterval = 10
+trustStore = certs/trust/server_register
 
 authMode = user
 username = user
 password = password
 
-trustStore = certs/trust/server_register
+registerInterval = 10
diff --git a/config/server_register_client.conf b/config/server_register_client.conf
index 1301f03..f0cc0b8 100644
--- a/config/server_register_client.conf
+++ b/config/server_register_client.conf
@@ -4,17 +4,20 @@
 #   applicationUri    OPC UA application URI
 #   certificate       Path to client certificate (.der)
 #   privateKey        Path to client private key (.der)
+#   trustStore        Directory containing trusted certificates (.der)
 #   securityMode      None, Sign, or SignAndEncrypt
 #   securityPolicy    None, Basic256Sha256, Aes256_Sha256_RsaPss,
 #                     Aes128_Sha256_RsaOaep, or ECC_nistP256
 #   authMode          "anonymous" or "user"
 #   username          Username (required when authMode = user)
 #   password          Password (required when authMode = user)
-#   trustStore        Directory containing trusted certificates (.der)
+
 
 applicationUri = urn:localhost:bobink:ServerRegister
+
 certificate = certs/ServerRegisterClient_cert.der
 privateKey = certs/ServerRegisterClient_key.der
+trustStore = certs/trust/server_register_client
 
 securityMode = SignAndEncrypt
 securityPolicy = Aes256_Sha256_RsaPss
@@ -22,5 +25,3 @@ securityPolicy = Aes256_Sha256_RsaPss
 authMode = user
 username = user
 password = password
-
-trustStore = certs/trust/server_register_client