Allow having multiple keys for bosco

Keys will be looked for in the following order:
- `/etc/osg/boscokeys/${ruser}@${rhost}.key`
- `/etc/osg/boscokeys/${ruser}.key`
- `/etc/osg/bosco.key`

Author: matyasselmeci

hosted-ce/30-remote-site-setup.sh

@@ -11,7 +11,8 @@ fi
 
 set -e
 
-BOSCO_KEY=/etc/osg/bosco.key
+DEFAULT_BOSCO_KEY=/etc/osg/bosco.key
+BOSCOKEYS_DIR=/etc/osg/boscokeys
 ENDPOINT_CONFIG=/etc/endpoints.ini
 SKIP_WN_INSTALL=no
 
@@ -32,7 +33,19 @@ function debug_file_contents {
 function fetch_remote_os_info {
     ruser=$1
     rhost=$2
-    ssh -q -i $BOSCO_KEY "$ruser@$rhost" "cat /etc/os-release"
+    ssh -q -i "$(get_bosco_key "$ruser" "$rhost")" "$ruser@$rhost" "cat /etc/os-release"
+}
+
+function get_bosco_key {
+    ruser=$1
+    rhost=$2
+    if [[ -f $BOSCOKEYS_DIR/${ruser}@${rhost}.key ]]; then
+        echo "$BOSCOKEYS_DIR/${ruser}@${rhost}.key"
+    elif [[ -f $BOSCOKEYS_DIR/${ruser}.key ]]; then
+        echo "$BOSCOKEYS_DIR/${ruser}.key"
+    else
+        echo "$DEFAULT_BOSCO_KEY"
+    fi
 }
 
 setup_ssh_config () {
@@ -45,7 +58,7 @@ setup_ssh_config () {
 
   # copy Bosco key
   ssh_key=$ssh_dir/bosco_key.rsa
-  cp $BOSCO_KEY $ssh_key
+  cp "$(get_bosco_key "$ruser" "$remote_fqdn")" $ssh_key
   chmod 600 $ssh_key
   chown "${ruser}": $ssh_key
 
@@ -77,10 +90,11 @@ EOF
 setup_endpoints_ini () {
     echo "Setting up endpoint.ini entry for ${ruser}@$remote_fqdn..."
     remote_os_major_ver=$1
+    ssh_key=$(get_bosco_key "$ruser" "$remote_fqdn")
     # The WN client updater uses "remote_dir" for WN client
     # configuration and remote copy. We need the absolute path
     # specifically for fetch-crl
-    remote_home_dir=$(ssh -q -i $BOSCO_KEY "${ruser}@$remote_fqdn" pwd)
+    remote_home_dir=$(ssh -q -i $ssh_key "${ruser}@$remote_fqdn" pwd)
     osg_ver=3.4
     if [[ $remote_os_major_ver -gt 6 ]]; then
         osg_ver=3.5
@@ -91,6 +105,7 @@ local_user = ${ruser}
 remote_host = $remote_fqdn
 remote_user = ${ruser}
 remote_dir = $remote_home_dir/bosco-osg-wn-client
+ssh_key = $ssh_key
 upstream_url = https://repo.opensciencegrid.org/tarball-install/${osg_ver}/osg-wn-client-latest.el${remote_os_major_ver}.x86_64.tar.gz
 EOF
 }
@@ -111,12 +126,12 @@ REMOTE_HOST_KEY=`ssh-keyscan -p "$remote_port" "$remote_fqdn"`
 root_ssh_dir=/root/.ssh/
 mkdir -p $root_ssh_dir
 chmod 700 $root_ssh_dir
-ln -s $BOSCO_KEY $root_ssh_dir/bosco_key.rsa
+ln -s "$(get_bosco_key "root" "$remote_fqdn")" $root_ssh_dir/bosco_key.rsa
 
 cat <<EOF > /etc/ssh/ssh_config
 Host $remote_fqdn
   Port $remote_port
-  IdentityFile ${BOSCO_KEY}
+  IdentityFile "$(get_bosco_key "root" "$remote_fqdn")"
   ControlMaster auto
   ControlPath /tmp/cm-%i-%r@%h:%p
   ControlPersist  15m