Merge pull request #21 from jpculp/switch-to-current-dir

Switch paths from `host-containers/admin` to `host-containers/current`
bottlerocket-os · Mar 31, 2021 · 34749d9 · 34749d9
2 parents f7fffa9 + cd29412
commit 34749d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/sshd_config b/sshd_config
@@ -1,6 +1,6 @@
-HostKey /.bottlerocket/host-containers/admin/etc/ssh/ssh_host_rsa_key
-HostKey /.bottlerocket/host-containers/admin/etc/ssh/ssh_host_ecdsa_key
-HostKey /.bottlerocket/host-containers/admin/etc/ssh/ssh_host_ed25519_key
+HostKey /.bottlerocket/host-containers/current/etc/ssh/ssh_host_rsa_key
+HostKey /.bottlerocket/host-containers/current/etc/ssh/ssh_host_ecdsa_key
+HostKey /.bottlerocket/host-containers/current/etc/ssh/ssh_host_ed25519_key
 
 PasswordAuthentication no
 

diff --git a/start_admin_sshd.sh b/start_admin_sshd.sh
@@ -9,8 +9,9 @@ log() {
 }
 
 declare -r local_user="ec2-user"
-declare -r ssh_host_key_dir="/.bottlerocket/host-containers/admin/etc/ssh"
-declare -r user_data="/.bottlerocket/host-containers/admin/user-data"
+declare -r persistent_storage_base_dir="/.bottlerocket/host-containers/current"
+declare -r ssh_host_key_dir="${persistent_storage_base_dir}/etc/ssh"
+declare -r user_data="${persistent_storage_base_dir}/user-data"
 declare -r user_ssh_dir="/home/${local_user}/.ssh"
 available_auth_methods=0