install-aws-server: Fix shellcheck warnings.

In tools/setup/install-aws-server line 25:
zulip_root=${ZULIP_ROOT:-$HOME/zulip}
^-- SC2034: zulip_root appears unused. Verify use (or export if used externally).

In tools/setup/install-aws-server line 40:
if [ -n "$zulip_confdir" ]; then
         ^-- SC2154: zulip_confdir is referenced but not assigned.

In tools/setup/install-aws-server line 55:
VIRTUALENV_NEEDED=$(if $(echo "$type" | grep -q app_frontend); then echo -n yes; else echo -n no; fi)
                       ^-- SC2091: Remove surrounding $() to avoid executing output.

In tools/setup/install-aws-server line 60:
SSH_OPTS=(-o HostKeyAlgorithms=ssh-rsa)
             ^-- SC2191: The = here is literal. To assign by index, use ( [index]=value ) with no spaces. To keep as literal, quote it.

In tools/setup/install-aws-server line 69:
ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
                                                                 ^-- SC2087: Quote 'EOF' to make here document expansions happen on the server side rather than on the client.

In tools/setup/install-aws-server line 86:
ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
                                                                 ^-- SC2087: Quote 'EOF' to make here document expansions happen on the server side rather than on the client.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2018-08-03 00:14:50 +00:00 committed by Tim Abbott
parent b15063155c
commit fc24d2e147
1 changed files with 7 additions and 5 deletions

View File

@ -22,7 +22,6 @@ if ! echo "$hostname" | grep -q zulip; then
exit 1
fi
set -x
zulip_root=${ZULIP_ROOT:-$HOME/zulip}
zulip_ssh_config_file="$HOME/.zulip-install-server.conf"
amazon_key_file=$(crudini --get "$zulip_ssh_config_file" ssh amazon_key_file)
@ -37,7 +36,7 @@ if ! [ -e "$server_private_key_file" ]; then
exit 1
fi
if [ -n "$zulip_confdir" ]; then
if [ -n "${zulip_confdir-}" ]; then
zulipconf_file="$zulip_confdir/zulip.conf"
secrets_file="$zulip_confdir/zulip-secrets.conf"
fi
@ -52,12 +51,12 @@ if [ -z "$branch" ]; then
branch=$(crudini --get "$zulip_ssh_config_file" repo default_branch)
fi
VIRTUALENV_NEEDED=$(if $(echo "$type" | grep -q app_frontend); then echo -n yes; else echo -n no; fi)
VIRTUALENV_NEEDED=$(if echo "$type" | grep -q app_frontend; then echo -n yes; else echo -n no; fi)
# Force RSA keys. We do this because the ECDSA key is not printed on syslog,
# and our puppet configuration does not use ECDSA. If we don't do this,
# we'll get key errors after puppet apply.
SSH_OPTS=(-o HostKeyAlgorithms=ssh-rsa)
SSH_OPTS=(-o 'HostKeyAlgorithms=ssh-rsa')
set +e
@ -66,6 +65,7 @@ sudo mkdir -p ~root/.ssh && sudo cp .ssh/authorized_keys /root/.ssh/authorized_k
sudo sed -i 's/disable_root: true/disable_root: false/' /etc/cloud/cloud.cfg
sudo mkdir -p /etc/zulip
EOF
# shellcheck disable=SC2029 disable=SC2087
ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
# Set the hostname early
echo "$hostname" > /etc/hostname
@ -83,6 +83,7 @@ if [ -e "$zulipconf_file" ]; then
scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$zulipconf_file" root@"$server":/etc/zulip/zulip.conf
fi
# shellcheck disable=SC2029 disable=SC2087
ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
set -x
# Finish setting up the SSH private key
@ -97,7 +98,7 @@ passwd -d root
apt-get update
apt-get -y upgrade
cd "$(mktemp -d)"
cd "\$(mktemp -d)"
# Get GitHub known_hosts setup
# TODO: Replace this with hardcoding the actual GitHub keys
@ -118,6 +119,7 @@ EOF
scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file" root@"$server":/home/zulip/.ssh/id_rsa
scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file".pub root@"$server":/home/zulip/.ssh/id_rsa.pub
# shellcheck disable=SC2029
ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
chown zulip:zulip /home/zulip/.ssh/id_rsa*
chmod 600 /home/zulip/.ssh/id_rsa*