renamed env var to P_TRUSTED_CA_CERTS_DIR

Author: nikhilsinhaparseable

server/src/cli.rs

@@ -35,7 +35,7 @@ pub struct Cli {
     pub tls_key_path: Option<PathBuf>,
 
     /// The location of other certificates to accept
-    pub other_cert_path: Option<PathBuf>,
+    pub trusted_ca_certs_path: Option<PathBuf>,
 
     /// The address on which the http server will listen.
     pub address: String,
@@ -125,7 +125,7 @@ impl Cli {
     // identifiers for arguments
     pub const TLS_CERT: &'static str = "tls-cert-path";
     pub const TLS_KEY: &'static str = "tls-key-path";
-    pub const OTHER_CERT: &'static str = "other-cert-path";
+    pub const TRUSTED_CA_CERTS_PATH: &'static str = "trusted-ca-certs-path";
     pub const ADDRESS: &'static str = "address";
     pub const DOMAIN_URI: &'static str = "origin";
     pub const STAGING: &'static str = "local-staging-path";
@@ -229,12 +229,12 @@ impl Cli {
                      .help("Local path on this device where private key file is located. Required to enable TLS"),
              )
             .arg(
-                Arg::new(Self::OTHER_CERT)
-                    .long(Self::OTHER_CERT)
-                    .env("P_OTHER_CERT_PATH")
+                Arg::new(Self::TRUSTED_CA_CERTS_PATH)
+                    .long(Self::TRUSTED_CA_CERTS_PATH)
+                    .env("P_TRUSTED_CA_CERTS_DIR")
                     .value_name("DIR")
                     .value_parser(validation::canonicalize_path)
-                    .help("Local path on this device where other certificate files are located.")
+                    .help("Local path on this device where all trusted certificates are located.")
             )
              .arg(
                  Arg::new(Self::ADDRESS)
@@ -521,7 +521,7 @@ impl FromArgMatches for Cli {
         self.query_cache_path = m.get_one::<PathBuf>(Self::QUERY_CACHE).cloned();
         self.tls_cert_path = m.get_one::<PathBuf>(Self::TLS_CERT).cloned();
         self.tls_key_path = m.get_one::<PathBuf>(Self::TLS_KEY).cloned();
-        self.other_cert_path = m.get_one::<PathBuf>(Self::OTHER_CERT).cloned();
+        self.trusted_ca_certs_path = m.get_one::<PathBuf>(Self::TRUSTED_CA_CERTS_PATH).cloned();
         self.domain_address = m.get_one::<Url>(Self::DOMAIN_URI).cloned();
 
         self.address = m

server/src/handlers/http/modal/ingest_server.rs

@@ -83,7 +83,7 @@ impl ParseableServer for IngestServer {
         let ssl = get_ssl_acceptor(
             &CONFIG.parseable.tls_cert_path,
             &CONFIG.parseable.tls_key_path,
-            &CONFIG.parseable.other_cert_path,
+            &CONFIG.parseable.trusted_ca_certs_path,
         )?;
 
         // fn that creates the app

server/src/handlers/http/modal/query_server.rs

@@ -65,7 +65,7 @@ impl ParseableServer for QueryServer {
         let ssl = get_ssl_acceptor(
             &CONFIG.parseable.tls_cert_path,
             &CONFIG.parseable.tls_key_path,
-            &CONFIG.parseable.other_cert_path,
+            &CONFIG.parseable.trusted_ca_certs_path,
         )?;
 
         let create_app_fn = move || {

server/src/handlers/http/modal/server.rs

@@ -96,7 +96,7 @@ impl ParseableServer for Server {
         let ssl = get_ssl_acceptor(
             &CONFIG.parseable.tls_cert_path,
             &CONFIG.parseable.tls_key_path,
-            &CONFIG.parseable.other_cert_path,
+            &CONFIG.parseable.trusted_ca_certs_path,
         )?;
 
         // Create a channel to trigger server shutdown