changed sftp calls to use IdentityFile as it will in Kuberenetes

Author: niquerio

docker-compose.yml

@@ -18,7 +18,7 @@ services:
     image: 'atmoz/sftp'
     volumes:
       - ./sftp/bib_search:/home/alma/bib_search
-      - ./sftp/ssh/id_rsa.pub:/home/alma/.ssh/keys/id_rsa.pub:ro
+      - ./sftp/ssh/ssh_client_rsa_key.pub:/home/alma/.ssh/keys/id_rsa.pub:ro
       - ./sftp/ssh/ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key
       - ./sftp/ssh/ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key
     command: alma:1001
@@ -29,6 +29,7 @@ services:
       - 'redis'
     volumes:
       - ./umich_catalog_indexing/.:/app
+      - ./sftp/ssh/ssh_client_rsa_key:/etc/secret-volume/id_rsa:ro
       - gem_cache:/gems
     environment:
       - SOLR_URL=http://solr:8026/solr/biblio

set_up_development_ssh_keys.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
 #clear out any current ssh keys
-rm umich_catalog_indexing/.ssh/*
-rm sftp/ssh/ssh_host*
-rm ssh_host*
+rm sftp/ssh/ssh_*
+rm ssh_*
 
 
 #generate the host ssh keys for the sftp service
@@ -24,6 +23,5 @@ rm ssh_host*
 #generate actual host login keys
 ssh-keygen -t rsa -b 4096 -f ssh_client_rsa_key < /dev/null
 
-cp ssh_client_rsa_key.pub sftp/ssh/id_rsa.pub
-mv ssh_client_rsa_key.pub umich_catalog_indexing/.ssh/id_rsa.pub
-mv ssh_client_rsa_key umich_catalog_indexing/.ssh/id_rsa
+mv ssh_client_rsa_key.pub sftp/ssh/
+mv ssh_client_rsa_key sftp/ssh/

umich_catalog_indexing/.env-dev-values

@@ -9,3 +9,4 @@ HATHI_OVERLAP_PASSWORD=pass
 ALMA_API_HOST='https://api-na.hosted.exlibrisgroup.com'
 SFTP_USER=alma
 SFTP_HOST=sftp
+SSH_KEY_PATH="/etc/secret-volume/id_rsa"

umich_catalog_indexing/bin/m_delete_ids

@@ -7,7 +7,7 @@ pkg_file=$1
 
 #copy file from alma-integrations to scratch directory
 # '@' removes printing interactive session
-sftp -b - alma@sftp << EOT
+sftp -oIdentityFile=/etc/secret-volume/id_rsa -b - alma@sftp << EOT
 @get $pkg_file scratch
 EOT
 

umich_catalog_indexing/bin/mindex_xml

@@ -14,7 +14,7 @@ pkg_file=$1
 
 #copy file from alma-integrations to scratch directory
 # '@' removes printing interactive session
-sftp -b - alma@sftp << EOT
+sftp -oIdentityFile=/etc/secret-volume/id_rsa -b - alma@sftp << EOT
 @get $pkg_file scratch
 EOT