Yaml (widdix#32)

* Fn::Sub and Auth Proxy * added access from agents to master alb added timeout to wget calls * JSON to YAML * JSON to YAML * say hello to US East (Ohio) Region * JSON to YAML * cleanup * clanup * cleanup * cleanup * JSON to YAML * updated docs * no message * added architecture diagram * fix * fix
vickatte · Oct 19, 2016 · 0c46e93 · 0c46e93
1 parent dc68f47
commit 0c46e93
Show file tree

Hide file tree

Showing 49 changed files with 6,306 additions and 6,445 deletions.
diff --git a/README.md b/README.md
@@ -9,12 +9,12 @@ Using our Infrastructure as Code templates will help you to bootstrap common set
 ## Templates
 We are offering the following templates:
 
-* [EC2](https://github.com/widdix/aws-cf-templates/tree/master/ec2)
-* [Jenkins ](https://github.com/widdix/aws-cf-templates/tree/master/jenkins)
-* [Security](https://github.com/widdix/aws-cf-templates/tree/master/security)
-* [Static website](https://github.com/widdix/aws-cf-templates/tree/master/static-website)
-* [VPC ](https://github.com/widdix/aws-cf-templates/tree/master/vpc)
-* [Wordpress](https://github.com/widdix/aws-cf-templates/tree/master/wordpress)
+* [EC2](./ec2/)
+* [Jenkins ](./jenkins/)
+* [Security](./security/)
+* [Static website](./static-website/)
+* [VPC](./vpc/)
+* [Wordpress](./wordpress/)
 
 We are interested in your requirements. [Please use the following survey to upvote and add templates you are impatiently waiting for](https://docs.google.com/forms/d/e/1FAIpQLSerhIuMuCWrHai639FoUOt8ffmMqWr0PWzLhCn3VN29VUi8TA/viewform?usp=send_form)
 

diff --git a/ec2/DEV.md b/ec2/DEV.md
@@ -5,5 +5,5 @@ To update the region map execute the following lines in your terminal:
 
 ```
 $ regions=$(aws ec2 describe-regions --query "Regions[].RegionName" --output text)
-$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn-ami-hvm-2016.03.3.x86_64-gp2" --query "Images[0].ImageId" --output "text"); echo "\"$region\": {\"AMI\": \"$ami\"},"; done
+$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn-ami-hvm-2016.09.0.20160923-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n  AMI: '$ami'\n"; done
 ```
diff --git a/ec2/README.md b/ec2/README.md
@@ -6,7 +6,8 @@ This template describes an EC2 instance with auto-recovery. If the instance fail
 ![Architecture](./ec2-auto-recovery.png?raw=true "Architecture")
 
 ### Installation Guide
-1. <a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=ec2-auto-recovery&templateURL=https://s3-eu-west-1.amazonaws.com/widdix-aws-cf-templates/ec2/ec2-auto-recovery.json">Launch Stack</a>
+1. This templates depends on one of our [`vpc-*azs.yaml`](../vpc/) templates. <a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=vpc-2azs&templateURL=https://s3-eu-west-1.amazonaws.com/widdix-aws-cf-templates/vpc/vpc-2azs.yaml">Launch Stack</a>
+1. <a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=ec2-auto-recovery&templateURL=https://s3-eu-west-1.amazonaws.com/widdix-aws-cf-templates/ec2/ec2-auto-recovery.yaml">Launch Stack</a>
 1. Click **Next** to proceed with the next step of the wizard.
 1. Specify a name and all parameters for the stack.
 1. Click **Next** to proceed with the next step of the wizard.
@@ -16,6 +17,10 @@ This template describes an EC2 instance with auto-recovery. If the instance fail
 1. Wait until the stack reaches the state **CREATE_COMPLETE**
 1. Grab the public IP address of the EC2 instance from the **Outputs** tab of your stack.
 
+### Dependencies
+* `vpc/vpc-*azs.yaml` (**required**)
+* `vpc/vpc-ssh-bastion.yaml`
+
 ## Support
 We offer support for our CloudFormation templates: setting up environments based on our templates, adopting templates to specific use cases, resolving issues in production environments. [Hire us!](https://widdix.net/)