added ssh key verification

OBOFoundry · Feb 9, 2022 · 5df5108 · 5df5108
1 parent 87090c2
commit 5df5108
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/provision/production/provision.sh b/provision/production/provision.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -ex
 
+INSTANCE_TYPE="t2.micro"
+DISK_SIZE=16
+
 ls -l aws/backend.tf production/purl-ssh production/purl-ssh.pub production/s3cfg > /dev/null
 WORKSPACE=`terraform -chdir=aws workspace show`
 
@@ -13,14 +16,16 @@ PROVISION_DIR=`pwd`
 PUBLIC_KEY="$PROVISION_DIR/production/purl-ssh.pub"
 
 printf 'tags = { Name = "purl-server", Workspace = "%s" }\n' $WORKSPACE > production/production-vars.tfvars
-printf 'instance_type = "t2.micro"\n' >> production/production-vars.tfvars
-printf 'disk_size = 16\n' >> production/production-vars.tfvars
+printf 'instance_type = "%s"\n' $INSTANCE_TYPE >> production/production-vars.tfvars
+printf 'disk_size = %d\n' $DISK_SIZE >> production/production-vars.tfvars
 printf 'public_key_path = "%s"\n' $PUBLIC_KEY >> production/production-vars.tfvars
 
 cat $PROVISION_DIR/production/production-vars.tfvars
 chmod 400 production/purl-ssh
 chmod 400 production/purl-ssh.pub
 
+diff -s <(ssh-keygen -l -f production/purl-ssh | cut -d' ' -f2) <(ssh-keygen -l -f production/purl-ssh.pub | cut -d' ' -f2)
+
 terraform -chdir=aws apply -auto-approve -var-file=$PROVISION_DIR/production/production-vars.tfvars
 
 HOST=`terraform -chdir=aws output -raw public_ip`
@@ -30,3 +35,4 @@ STAGE_DIR=/home/ubuntu/stage_dir
 
 ansible-playbook -e "stage_dir=$STAGE_DIR" -e "creds=$S3_CREDS" -u ubuntu -i "$HOST," --private-key $PRIVATE_KEY stage.yaml
 ansible-playbook -e "stage_dir=$STAGE_DIR" -u ubuntu -i "$HOST," --private-key $PRIVATE_KEY start_services.yaml
+echo "Done"