config: Break out some variables etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 566d229d6fe7d5e5febdc4812635b4b1fe86bb7c..90e485c110bfdb7c43cf2a4d8cd7831ad7aea311 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -1878,7 +1878,7 @@ mod mgmtchannel_proxy {
   }
 
   inventory::submit!{Subcommand(
-    "mgmtchannel-proxy",
+    SSH_PROXY_SUBCMD,
     "connect to management channel and copy raw message data back and forth",
     call,
   )}

diff --git a/src/config.rs b/src/config.rs
index b544407b348d7144f593d4015bc3d2fb2fe1692e..e5b3a74e219fb93d4e2218746d333d6bbfda3cde 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -14,6 +14,8 @@ pub const EXIT_DISASTER  : i32 = 16;
 pub const DEFAULT_CONFIG_DIR       : &str = "/etc/otter";
 pub const DEFAULT_CONFIG_LEAFNAME  : &str = "server.toml";
 pub const DEFAULT_SENDMAIL_PROGRAM : &str = "/usr/sbin/sendmail";
+pub const DEFAULT_SSH_PROXY_CMD    : &str = "otter-ssh-proxy";
+pub const SSH_PROXY_SUBCMD         : &str = "mgmtchannel-proxy";
 
 pub const DAEMON_STARTUP_REPORT: &str = "otter-daemon started";
 pub const LOG_ENV_VAR: &str = "OTTER_LOG";
@@ -164,7 +166,7 @@ impl ServerConfigSpec {
       specd.unwrap_or_else(|| format!("{}/{}", &libexec_dir, leaf))
     };
     let usvg_bin        = in_libexec(usvg_bin,     "usvg"              );
-    let ssh_proxy_bin   = in_libexec(ssh_proxy_bin,"otter-ssh-proxy"   );
+    let ssh_proxy_bin   = in_libexec(ssh_proxy_bin, DEFAULT_SSH_PROXY_CMD );
 
     let authorized_keys = if let Some(ak) = authorized_keys { ak } else {
       let home = home().context("for authorized_keys")?;