diff --git a/scripts/network/domr/call_firewall.sh b/scripts/network/domr/call_firewall.sh index 8878ec833ba..287efa21f5d 100755 --- a/scripts/network/domr/call_firewall.sh +++ b/scripts/network/domr/call_firewall.sh @@ -85,7 +85,7 @@ do esac done -CERT="$(dirname $0)/id_rsa" +cert="/root/.ssh/id_rsa.cloud" # Check if DomR is up and running. If not, exit with error code 1. check_gw "$domRIp" @@ -114,7 +114,7 @@ then exit 2 fi -ssh -p 3922 -q -o StrictHostKeyChecking=no -i $CERT root@$domRIp "/root/firewall.sh $*" +ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$domRIp "/root/firewall.sh $*" exit $? diff --git a/scripts/network/domr/call_loadbalancer.sh b/scripts/network/domr/call_loadbalancer.sh index fd9a8c02700..fed3abe3d80 100755 --- a/scripts/network/domr/call_loadbalancer.sh +++ b/scripts/network/domr/call_loadbalancer.sh @@ -26,7 +26,7 @@ copy_haproxy() { local domRIp=$1 local cfg=$2 - scp -P 3922 -q -o StrictHostKeyChecking=no -i $CERT $cfg root@$domRIp:/etc/haproxy/haproxy.cfg.new + scp -P 3922 -q -o StrictHostKeyChecking=no -i $cert $cfg root@$domRIp:/etc/haproxy/haproxy.cfg.new return $? } @@ -56,7 +56,7 @@ do esac done -CERT="$(dirname $0)/id_rsa" +cert="/root/.ssh/id_rsa.cloud" if [ "$iflag$fflag" != "11" ] then @@ -79,5 +79,5 @@ then exit 1 fi -ssh -p 3922 -q -o StrictHostKeyChecking=no -i $CERT root@$domRIp "/root/loadbalancer.sh $*" +ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$domRIp "/root/loadbalancer.sh $*" exit $? diff --git a/scripts/network/domr/vm_data.sh b/scripts/network/domr/vm_data.sh index 78fc7f92c50..32b27bbdad9 100755 --- a/scripts/network/domr/vm_data.sh +++ b/scripts/network/domr/vm_data.sh @@ -10,7 +10,7 @@ usage() { } set -x -CERT="/root/.ssh/id_rsa.cloud" +cert="/root/.ssh/id_rsa.cloud" PORT=3922 create_htaccess() { @@ -24,7 +24,7 @@ create_htaccess() { entry="RewriteRule ^$file$ ../$folder/%{REMOTE_ADDR}/$file [L,NC,QSA]" htaccessFolder="/var/www/html/latest" htaccessFile=$htaccessFolder/.htaccess - ssh -p $PORT -o StrictHostKeyChecking=no -i $CERT root@$domrIp "mkdir -p $htaccessFolder; touch $htaccessFile; grep -F \"$entry\" $htaccessFile; if [ \$? -gt 0 ]; then echo -e \"$entry\" >> $htaccessFile; fi" >/dev/null + ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "mkdir -p $htaccessFolder; touch $htaccessFile; grep -F \"$entry\" $htaccessFile; if [ \$? -gt 0 ]; then echo -e \"$entry\" >> $htaccessFile; fi" >/dev/null result=$? if [ $result -eq 0 ] @@ -32,7 +32,7 @@ create_htaccess() { entry="Options -Indexes\\nOrder Deny,Allow\\nDeny from all\\nAllow from $vmIp" htaccessFolder="/var/www/html/$folder/$vmIp" htaccessFile=$htaccessFolder/.htaccess - ssh -p $PORT -o StrictHostKeyChecking=no -i $CERT root@$domrIp "mkdir -p $htaccessFolder; echo -e \"$entry\" > $htaccessFile" >/dev/null + ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "mkdir -p $htaccessFolder; echo -e \"$entry\" > $htaccessFile" >/dev/null result=$? fi @@ -47,7 +47,7 @@ copy_vm_data_file() { local dataFile=$5 chmod +r $dataFile - scp -P $PORT -o StrictHostKeyChecking=no -i $CERT $dataFile root@$domrIp:/var/www/html/$folder/$vmIp/$file >/dev/null + scp -P $PORT -o StrictHostKeyChecking=no -i $cert $dataFile root@$domrIp:/var/www/html/$folder/$vmIp/$file >/dev/null return $? } @@ -58,7 +58,7 @@ delete_vm_data_file() { local file=$4 vmDataFilePath="/var/www/html/$folder/$vmIp/$file" - ssh -p $PORT -o StrictHostKeyChecking=no -i $CERT root@$domrIp "if [ -f $vmDataFilePath ]; then rm -rf $vmDataFilePath; fi" >/dev/null + ssh -p $PORT -o StrictHostKeyChecking=no -i $cert root@$domrIp "if [ -f $vmDataFilePath ]; then rm -rf $vmDataFilePath; fi" >/dev/null return $? }