renaming property name to avoid confusion (use ssh keys, not just ssh)

ControlSystemStudio · Nov 7, 2023 · 1fc76b4 · 1fc76b4
1 parent 145f555
commit 1fc76b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLogger.java b/services/alarm-config-logger/src/main/java/org/phoebus/alarm/logging/AlarmConfigLogger.java
@@ -115,7 +115,7 @@ private void initialize() {
             }
         }
         // Set up the ssh keys if used
-        if(Boolean.parseBoolean(props.getProperty("use_ssh", "false"))) {
+        if(Boolean.parseBoolean(props.getProperty("use_ssh_keys", "false"))) {
             File sshDir = new File(FS.DETECTED.userHome(), ".ssh");
             JGitKeyCache cache = new JGitKeyCache();
             SshdSessionFactoryBuilder builder = new SshdSessionFactoryBuilder();
@@ -268,7 +268,7 @@ private synchronized void processAlarmConfigMessages(String rawPath, String alar
                             PushCommand pushCommand = git.push();
                             pushCommand.setRemote(REMOTE_NAME);
                             pushCommand.setForce(true);
-                            if (Boolean.parseBoolean(props.getProperty("use_ssh", "false"))) {
+                            if (Boolean.parseBoolean(props.getProperty("use_ssh_keys", "false"))) {
                                 pushCommand.setTransportConfigCallback(transport -> {
                                     SshTransport sshTransport = (SshTransport) transport;
                                     sshTransport.setSshSessionFactory(sshdSessionFactory);

diff --git a/services/alarm-config-logger/src/main/resources/alarm_config_logger.properties b/services/alarm-config-logger/src/main/resources/alarm_config_logger.properties
@@ -15,7 +15,7 @@ local.location=/tmp/alarm_repo
 remote.location=[email protected]:site-org/alarm-config.git
 
 # use ssh keys to push to remote repo
-use_ssh=false
+use_ssh_keys=false
 
 # complete path to the ssh key to be used, if not set then the server will use the private keys from ~/.ssh/
 #private_key=