Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

install-aws-server: secrets enhancements.

This commit is contained in:
Tim Abbott 2016-07-20 21:33:36 -07:00 committed by Tim Abbott
parent ed0da5f874
commit c6bdc2130b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/setup/install-aws-server
View File

@ -37,6 +37,11 @@ if ! [ -e "$server_private_key_file" ]; then
exit 1 exit 1
fi fi
if [ -z "$secrets_file" ]; then
echo "Specify secrets_file via environment."
exit 1
fi
zulip_repo=$(crudini --get "$zulip_ssh_config_file" repo repo_url) zulip_repo=$(crudini --get "$zulip_ssh_config_file" repo repo_url)
if [ -z "$branch" ]; then if [ -z "$branch" ]; then
@ -55,6 +60,7 @@ set +e
ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lubuntu -o "ControlMaster=no" <<EOF ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lubuntu -o "ControlMaster=no" <<EOF
sudo mkdir -p ~root/.ssh && sudo cp .ssh/authorized_keys /root/.ssh/authorized_keys sudo mkdir -p ~root/.ssh && sudo cp .ssh/authorized_keys /root/.ssh/authorized_keys
sudo sed -i 's/disable_root: true/disable_root: false/' /etc/cloud/cloud.cfg sudo sed -i 's/disable_root: true/disable_root: false/' /etc/cloud/cloud.cfg
mkdir -p /etc/zulip
EOF EOF
set -e set -e
@ -62,6 +68,7 @@ set -e
# Give server its SSH keys # Give server its SSH keys
scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file" root@"$server":/root/.ssh/id_rsa scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file" root@"$server":/root/.ssh/id_rsa
scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file".pub root@"$server":/root/.ssh/id_rsa.pub scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file".pub root@"$server":/root/.ssh/id_rsa.pub
scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$secrets_file" root@"$server":/etc/zulip/zulip-secrets.conf
ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
# Finish setting up the SSH private key # Finish setting up the SSH private key
@ -81,7 +88,7 @@ apt-get -y upgrade
cd /root cd /root
if ! [ -e "zulip" ]; then if ! [ -e "zulip" ]; then
# need to install git to clone the repo # need to install git to clone the repo
apt-get install -y git apt-get install -y git crudini
git clone $zulip_repo git clone $zulip_repo
fi fi
cd zulip cd zulip