More common sense

This commit is contained in:
Ivan Ilves 2017-02-08 06:05:58 +01:00
parent e1b4c0e8cd
commit c3acbf82c4
2 changed files with 4 additions and 2 deletions

View File

@ -9,4 +9,4 @@ fi
export AWS_PROFILE=$(echo ${1} | awk -F"." '{print $2}')
aws ec2 describe-subnets | grep CidrBlock\":\ \"10 | awk -F"\"" '{print $4}'
aws ec2 describe-subnets | grep CidrBlock\":\ \"10 | awk -F"\"" '{print $4}' | sort | uniq

View File

@ -30,7 +30,7 @@ fi
declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE})
declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}"
declare -r SSH_OPTS="-oLogLevel=QUIET -oConnectTimeout=10"
declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-QUIET} -oConnectTimeout=10"
cd $(dirname ${0})
@ -54,10 +54,12 @@ echo "TUNNEL ID: ${TUNNEL_ID}"
./scripts/client-setup.sh ${TUNNEL_ID} ${IP_BASE}
set +e
for NETWORK in ${NETWORKS}; do
echo "> ROUTE: ${NETWORK}"
./scripts/client-route.sh ${TUNNEL_ID} ${NETWORK}
done
set -e
ssh ${SSH_OPTS} ${SSH_SERVER} mkdir -p ${REMOTE_PATH}
scp ${SSH_OPTS} ./scripts/server-*.sh ${SSH_SERVER}:${REMOTE_PATH} >/dev/null