From 0c9399656d70a28cd1b33871eea1d7114bed548c Mon Sep 17 00:00:00 2001
From: Evan Carlin <evan@carlin.com>
Date: Tue, 9 Apr 2024 10:30:02 -0600
Subject: [PATCH] Fix #476: remove overlapping ssh binds (#477)

---
 rsconf/package_data/vm_devbox/start.sh.jinja                | 6 +++---
 .../1.out/srv/host/v9.radia.run/srv/vm_devbox_user-1/start  | 6 +++---
 .../1.out/srv/host/v9.radia.run/vm_devbox_user-1.sh         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rsconf/package_data/vm_devbox/start.sh.jinja b/rsconf/package_data/vm_devbox/start.sh.jinja
index 0fef0594..11a449d9 100644
--- a/rsconf/package_data/vm_devbox/start.sh.jinja
+++ b/rsconf/package_data/vm_devbox/start.sh.jinja
@@ -67,7 +67,6 @@ install --mode=400 --owner=root --group=root /dev/stdin /etc/ssh/sshd_config<<EO
 
 # Keep vagrant ssh working
 Include /etc/ssh/sshd_config.d/*.conf
-ListenAddress 0.0.0.0:22
 
 HostKey {{ this.ssh_guest_host_key_f }}
 ListenAddress 0.0.0.0:{{ this.ssh_port }}
@@ -80,8 +79,9 @@ PermitRootLogin no
 Protocol 2
 X11Forwarding yes
 
-# SSH access from localhost (ex for sirepo.job_driver.sbatch)
-ListenAddress {{ this.local_ip }}:22
+# For `vagrant ssh` and SSH access from local_ip
+ListenAddress 0.0.0.0:22
+# Allow passwords just for vagrant from local_ip (ex for sirepo.job_driver.sbatch)
 Match User {{ this.run_u }} Address {{ this.local_ip }}
     PasswordAuthentication yes
 EOF_SSH_CONFIG
diff --git a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/srv/vm_devbox_user-1/start b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/srv/vm_devbox_user-1/start
index 2795bb5c..8846754f 100644
--- a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/srv/vm_devbox_user-1/start
+++ b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/srv/vm_devbox_user-1/start
@@ -67,7 +67,6 @@ install --mode=400 --owner=root --group=root /dev/stdin /etc/ssh/sshd_config<<EO
 
 # Keep vagrant ssh working
 Include /etc/ssh/sshd_config.d/*.conf
-ListenAddress 0.0.0.0:22
 
 HostKey /etc/ssh/host_key
 ListenAddress 0.0.0.0:11110
@@ -80,8 +79,9 @@ PermitRootLogin no
 Protocol 2
 X11Forwarding yes
 
-# SSH access from localhost (ex for sirepo.job_driver.sbatch)
-ListenAddress 127.0.0.1:22
+# For `vagrant ssh` and SSH access from local_ip
+ListenAddress 0.0.0.0:22
+# Allow passwords just for vagrant from local_ip (ex for sirepo.job_driver.sbatch)
 Match User vagrant Address 127.0.0.1
     PasswordAuthentication yes
 EOF_SSH_CONFIG
diff --git a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/vm_devbox_user-1.sh b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/vm_devbox_user-1.sh
index 04ebc05c..bdab6f02 100644
--- a/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/vm_devbox_user-1.sh
+++ b/tests/pkcli/build_data/1.out/srv/host/v9.radia.run/vm_devbox_user-1.sh
@@ -4,7 +4,7 @@ rsconf_service_prepare 'vm_devbox_user-1' '/etc/systemd/system/vm_devbox_user-1.
 rsconf_install_access '700' 'vagrant' 'vagrant'
 rsconf_install_directory '/srv/vm_devbox_user-1'
 rsconf_install_access '500' 'vagrant' 'vagrant'
-rsconf_install_file '/srv/vm_devbox_user-1/start' '010c45bdda17d571d19d946057f11b1a'
+rsconf_install_file '/srv/vm_devbox_user-1/start' '25136a48b7b1ad798029c998c93a7798'
 rsconf_install_file '/srv/vm_devbox_user-1/stop' '94f5e7855deadc753f54580dfad70217'
 rsconf_install_access '444' 'root' 'root'
 rsconf_install_file '/etc/systemd/system/vm_devbox_user-1.service' '95beabb09a3e8a9977002d11ae4e47cd'