From b0cfae2e1319e76f1fd7621c5cacc53d21150f0d Mon Sep 17 00:00:00 2001 From: Michael Wittig Date: Mon, 20 Sep 2021 16:16:06 +0200 Subject: [PATCH] [Security] * - Update Amazon Linux 2 to 20210813.1 (#583) [Security] ecs/* - Update Amazon Linux 2 ECS-optimized to 20210902 --- ec2/README.md | 2 +- ecs/README.md | 2 +- ecs/cluster-cost-optimized.yaml | 42 ++++++++++++------------- ecs/cluster.yaml | 42 ++++++++++++------------- jenkins/README.md | 2 +- jenkins/jenkins2-ha-agents.yaml | 42 ++++++++++++------------- jenkins/jenkins2-ha.yaml | 42 ++++++++++++------------- security/README.md | 2 +- security/auth-proxy-ha-github-orga.yaml | 42 ++++++++++++------------- vpc/README.md | 2 +- vpc/vpc-ssh-bastion.yaml | 42 ++++++++++++------------- vpc/vpc-vpn-bastion.yaml | 42 ++++++++++++------------- wordpress/README.md | 2 +- wordpress/wordpress-ha-aurora.yaml | 42 ++++++++++++------------- wordpress/wordpress-ha.yaml | 42 ++++++++++++------------- 15 files changed, 195 insertions(+), 195 deletions(-) diff --git a/ec2/README.md b/ec2/README.md index 622c440b0..fa0367d68 100644 --- a/ec2/README.md +++ b/ec2/README.md @@ -8,5 +8,5 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/ec2/ To update the region map execute the following lines in your terminal: ``` -for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210721.2-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done +for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210813.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done ``` diff --git a/ecs/README.md b/ecs/README.md index a16f3d8fc..9facaa480 100644 --- a/ecs/README.md +++ b/ecs/README.md @@ -8,5 +8,5 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/ecs/ To update the region map execute the following lines in your terminal: ``` -for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-ecs-hvm-2.0.20210723-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done +for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-ecs-hvm-2.0.20210902-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done ``` diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml index c2cec72cc..5f17089ab 100644 --- a/ecs/cluster-cost-optimized.yaml +++ b/ecs/cluster-cost-optimized.yaml @@ -175,47 +175,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - ECSAMI: 'ami-021226f834258c2e8' + ECSAMI: 'ami-0c92e3d4b0e90eeef' 'eu-north-1': - ECSAMI: 'ami-0f3c0e5b74d8df5a7' + ECSAMI: 'ami-0e3d6469fb7b7bf3d' 'ap-south-1': - ECSAMI: 'ami-0fd39ae05e1da03c0' + ECSAMI: 'ami-0b8087b9a726c87de' 'eu-west-3': - ECSAMI: 'ami-094711aebfd2b111b' + ECSAMI: 'ami-00f9a9c1fc2208dc6' 'eu-west-2': - ECSAMI: 'ami-060618797d1decb3e' + ECSAMI: 'ami-0687841b15858229f' 'eu-south-1': - ECSAMI: 'ami-08d50a8eb2e557951' + ECSAMI: 'ami-09a906e9202ec2903' 'eu-west-1': - ECSAMI: 'ami-03d256b62e46142e5' + ECSAMI: 'ami-037d203e54a0a9c14' 'ap-northeast-3': - ECSAMI: 'ami-0debaaf41a8a02bc4' + ECSAMI: 'ami-0442df3888d708161' 'ap-northeast-2': - ECSAMI: 'ami-0bd002eaae0485874' + ECSAMI: 'ami-0a9925891cc681519' 'me-south-1': - ECSAMI: 'ami-02183f13e2aa96970' + ECSAMI: 'ami-0f52e412d0c294974' 'ap-northeast-1': - ECSAMI: 'ami-02898546ea44fc778' + ECSAMI: 'ami-0822fa1ed6836019b' 'sa-east-1': - ECSAMI: 'ami-051b03c7f6f2e0175' + ECSAMI: 'ami-0538c9b9c31d85978' 'ca-central-1': - ECSAMI: 'ami-025373a49914a3494' + ECSAMI: 'ami-01a77b0247d81c003' 'ap-east-1': - ECSAMI: 'ami-08b2827e1fea0a4f9' + ECSAMI: 'ami-04ea8426c3bd7441f' 'ap-southeast-1': - ECSAMI: 'ami-085fd8639f8b2ad71' + ECSAMI: 'ami-03615fd9ef545c196' 'ap-southeast-2': - ECSAMI: 'ami-0432fca19dd3ca234' + ECSAMI: 'ami-0310d0e01c1e033c0' 'eu-central-1': - ECSAMI: 'ami-0114eb74b66592f8b' + ECSAMI: 'ami-06e3e9f1bf6945099' 'us-east-1': - ECSAMI: 'ami-09d2c35d7664ddd48' + ECSAMI: 'ami-03fe4d5b1d229063a' 'us-east-2': - ECSAMI: 'ami-00b70fb5bca6ac778' + ECSAMI: 'ami-07f26587d2d1c39a7' 'us-west-1': - ECSAMI: 'ami-046185e5373558eba' + ECSAMI: 'ami-0c6712b4108e5909b' 'us-west-2': - ECSAMI: 'ami-0b2bd1a0c09913fd8' + ECSAMI: 'ami-09f253e2f2e610302' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml index fcfda7068..e20a148f1 100644 --- a/ecs/cluster.yaml +++ b/ecs/cluster.yaml @@ -207,47 +207,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - ECSAMI: 'ami-021226f834258c2e8' + ECSAMI: 'ami-0c92e3d4b0e90eeef' 'eu-north-1': - ECSAMI: 'ami-0f3c0e5b74d8df5a7' + ECSAMI: 'ami-0e3d6469fb7b7bf3d' 'ap-south-1': - ECSAMI: 'ami-0fd39ae05e1da03c0' + ECSAMI: 'ami-0b8087b9a726c87de' 'eu-west-3': - ECSAMI: 'ami-094711aebfd2b111b' + ECSAMI: 'ami-00f9a9c1fc2208dc6' 'eu-west-2': - ECSAMI: 'ami-060618797d1decb3e' + ECSAMI: 'ami-0687841b15858229f' 'eu-south-1': - ECSAMI: 'ami-08d50a8eb2e557951' + ECSAMI: 'ami-09a906e9202ec2903' 'eu-west-1': - ECSAMI: 'ami-03d256b62e46142e5' + ECSAMI: 'ami-037d203e54a0a9c14' 'ap-northeast-3': - ECSAMI: 'ami-0debaaf41a8a02bc4' + ECSAMI: 'ami-0442df3888d708161' 'ap-northeast-2': - ECSAMI: 'ami-0bd002eaae0485874' + ECSAMI: 'ami-0a9925891cc681519' 'me-south-1': - ECSAMI: 'ami-02183f13e2aa96970' + ECSAMI: 'ami-0f52e412d0c294974' 'ap-northeast-1': - ECSAMI: 'ami-02898546ea44fc778' + ECSAMI: 'ami-0822fa1ed6836019b' 'sa-east-1': - ECSAMI: 'ami-051b03c7f6f2e0175' + ECSAMI: 'ami-0538c9b9c31d85978' 'ca-central-1': - ECSAMI: 'ami-025373a49914a3494' + ECSAMI: 'ami-01a77b0247d81c003' 'ap-east-1': - ECSAMI: 'ami-08b2827e1fea0a4f9' + ECSAMI: 'ami-04ea8426c3bd7441f' 'ap-southeast-1': - ECSAMI: 'ami-085fd8639f8b2ad71' + ECSAMI: 'ami-03615fd9ef545c196' 'ap-southeast-2': - ECSAMI: 'ami-0432fca19dd3ca234' + ECSAMI: 'ami-0310d0e01c1e033c0' 'eu-central-1': - ECSAMI: 'ami-0114eb74b66592f8b' + ECSAMI: 'ami-06e3e9f1bf6945099' 'us-east-1': - ECSAMI: 'ami-09d2c35d7664ddd48' + ECSAMI: 'ami-03fe4d5b1d229063a' 'us-east-2': - ECSAMI: 'ami-00b70fb5bca6ac778' + ECSAMI: 'ami-07f26587d2d1c39a7' 'us-west-1': - ECSAMI: 'ami-046185e5373558eba' + ECSAMI: 'ami-0c6712b4108e5909b' 'us-west-2': - ECSAMI: 'ami-0b2bd1a0c09913fd8' + ECSAMI: 'ami-09f253e2f2e610302' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/jenkins/README.md b/jenkins/README.md index 0e0e73c88..09ea7fcd5 100644 --- a/jenkins/README.md +++ b/jenkins/README.md @@ -8,5 +8,5 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/jenkins/ To update the region map execute the following lines in your terminal: ``` -for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210721.2-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done +for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210813.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done ``` diff --git a/jenkins/jenkins2-ha-agents.yaml b/jenkins/jenkins2-ha-agents.yaml index e7d4b9048..c44eeb675 100644 --- a/jenkins/jenkins2-ha-agents.yaml +++ b/jenkins/jenkins2-ha-agents.yaml @@ -219,47 +219,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - AMI: 'ami-0edec67949fd25461' + AMI: 'ami-03590d67411bbd24e' 'eu-north-1': - AMI: 'ami-0d441f5643da997cb' + AMI: 'ami-0f0b4cb72cf3eadf3' 'ap-south-1': - AMI: 'ami-04db49c0fb2215364' + AMI: 'ami-0a23ccb2cdd9286bb' 'eu-west-3': - AMI: 'ami-0d49cec198762b78c' + AMI: 'ami-072056ff9d3689e7b' 'eu-west-2': - AMI: 'ami-0d26eb3972b7f8c96' + AMI: 'ami-0dbec48abfe298cab' 'eu-south-1': - AMI: 'ami-0fce326033a239d55' + AMI: 'ami-043c883e65558daa0' 'eu-west-1': - AMI: 'ami-02b4e72b17337d6c1' + AMI: 'ami-0d1bf5b68307103c2' 'ap-northeast-3': - AMI: 'ami-0e787554e61105680' + AMI: 'ami-09ec82600a05bc23a' 'ap-northeast-2': - AMI: 'ami-0a0de518b1fc4524c' + AMI: 'ami-08c64544f5cfcddd0' 'me-south-1': - AMI: 'ami-004b77593bd476317' + AMI: 'ami-0cc423da78c883d64' 'ap-northeast-1': - AMI: 'ami-09ebacdc178ae23b7' + AMI: 'ami-02892a4ea9bfa2192' 'sa-east-1': - AMI: 'ami-0f8243a5175208e08' + AMI: 'ami-09b9b17384f68fd7c' 'ca-central-1': - AMI: 'ami-02f84cf47c23f1769' + AMI: 'ami-0e2407e55b9816758' 'ap-east-1': - AMI: 'ami-0a2115f8cc0a3956b' + AMI: 'ami-0de9d09f41c5e334c' 'ap-southeast-1': - AMI: 'ami-0f511ead81ccde020' + AMI: 'ami-082105f875acab993' 'ap-southeast-2': - AMI: 'ami-0aab712d6363da7f9' + AMI: 'ami-0210560cedcb09f07' 'eu-central-1': - AMI: 'ami-0453cb7b5f2b7fca2' + AMI: 'ami-07df274a488ca9195' 'us-east-1': - AMI: 'ami-0c2b8ca1dad447f8a' + AMI: 'ami-087c17d1fe0178315' 'us-east-2': - AMI: 'ami-0443305dabd4be2bc' + AMI: 'ami-00dfe2c7ce89a450b' 'us-west-1': - AMI: 'ami-04b6c97b14c54de18' + AMI: 'ami-011996ff98de391d1' 'us-west-2': - AMI: 'ami-083ac7c7ecf9bb9b0' + AMI: 'ami-0c2d06d50ce30b442' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasZeroAgents: !Equals [!Ref AgentMinSize, '0'] diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml index 439cedc75..691ff430c 100644 --- a/jenkins/jenkins2-ha.yaml +++ b/jenkins/jenkins2-ha.yaml @@ -167,47 +167,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - AMI: 'ami-0edec67949fd25461' + AMI: 'ami-03590d67411bbd24e' 'eu-north-1': - AMI: 'ami-0d441f5643da997cb' + AMI: 'ami-0f0b4cb72cf3eadf3' 'ap-south-1': - AMI: 'ami-04db49c0fb2215364' + AMI: 'ami-0a23ccb2cdd9286bb' 'eu-west-3': - AMI: 'ami-0d49cec198762b78c' + AMI: 'ami-072056ff9d3689e7b' 'eu-west-2': - AMI: 'ami-0d26eb3972b7f8c96' + AMI: 'ami-0dbec48abfe298cab' 'eu-south-1': - AMI: 'ami-0fce326033a239d55' + AMI: 'ami-043c883e65558daa0' 'eu-west-1': - AMI: 'ami-02b4e72b17337d6c1' + AMI: 'ami-0d1bf5b68307103c2' 'ap-northeast-3': - AMI: 'ami-0e787554e61105680' + AMI: 'ami-09ec82600a05bc23a' 'ap-northeast-2': - AMI: 'ami-0a0de518b1fc4524c' + AMI: 'ami-08c64544f5cfcddd0' 'me-south-1': - AMI: 'ami-004b77593bd476317' + AMI: 'ami-0cc423da78c883d64' 'ap-northeast-1': - AMI: 'ami-09ebacdc178ae23b7' + AMI: 'ami-02892a4ea9bfa2192' 'sa-east-1': - AMI: 'ami-0f8243a5175208e08' + AMI: 'ami-09b9b17384f68fd7c' 'ca-central-1': - AMI: 'ami-02f84cf47c23f1769' + AMI: 'ami-0e2407e55b9816758' 'ap-east-1': - AMI: 'ami-0a2115f8cc0a3956b' + AMI: 'ami-0de9d09f41c5e334c' 'ap-southeast-1': - AMI: 'ami-0f511ead81ccde020' + AMI: 'ami-082105f875acab993' 'ap-southeast-2': - AMI: 'ami-0aab712d6363da7f9' + AMI: 'ami-0210560cedcb09f07' 'eu-central-1': - AMI: 'ami-0453cb7b5f2b7fca2' + AMI: 'ami-07df274a488ca9195' 'us-east-1': - AMI: 'ami-0c2b8ca1dad447f8a' + AMI: 'ami-087c17d1fe0178315' 'us-east-2': - AMI: 'ami-0443305dabd4be2bc' + AMI: 'ami-00dfe2c7ce89a450b' 'us-west-1': - AMI: 'ami-04b6c97b14c54de18' + AMI: 'ami-011996ff98de391d1' 'us-west-2': - AMI: 'ami-083ac7c7ecf9bb9b0' + AMI: 'ami-0c2d06d50ce30b442' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/security/README.md b/security/README.md index 12d81433f..a2fc816f3 100644 --- a/security/README.md +++ b/security/README.md @@ -8,5 +8,5 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/security/ To update the region map execute the following lines in your terminal: ``` -for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210721.2-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done +for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210813.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done ``` diff --git a/security/auth-proxy-ha-github-orga.yaml b/security/auth-proxy-ha-github-orga.yaml index 679977f58..711a7a073 100644 --- a/security/auth-proxy-ha-github-orga.yaml +++ b/security/auth-proxy-ha-github-orga.yaml @@ -145,47 +145,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - AMI: 'ami-0edec67949fd25461' + AMI: 'ami-03590d67411bbd24e' 'eu-north-1': - AMI: 'ami-0d441f5643da997cb' + AMI: 'ami-0f0b4cb72cf3eadf3' 'ap-south-1': - AMI: 'ami-04db49c0fb2215364' + AMI: 'ami-0a23ccb2cdd9286bb' 'eu-west-3': - AMI: 'ami-0d49cec198762b78c' + AMI: 'ami-072056ff9d3689e7b' 'eu-west-2': - AMI: 'ami-0d26eb3972b7f8c96' + AMI: 'ami-0dbec48abfe298cab' 'eu-south-1': - AMI: 'ami-0fce326033a239d55' + AMI: 'ami-043c883e65558daa0' 'eu-west-1': - AMI: 'ami-02b4e72b17337d6c1' + AMI: 'ami-0d1bf5b68307103c2' 'ap-northeast-3': - AMI: 'ami-0e787554e61105680' + AMI: 'ami-09ec82600a05bc23a' 'ap-northeast-2': - AMI: 'ami-0a0de518b1fc4524c' + AMI: 'ami-08c64544f5cfcddd0' 'me-south-1': - AMI: 'ami-004b77593bd476317' + AMI: 'ami-0cc423da78c883d64' 'ap-northeast-1': - AMI: 'ami-09ebacdc178ae23b7' + AMI: 'ami-02892a4ea9bfa2192' 'sa-east-1': - AMI: 'ami-0f8243a5175208e08' + AMI: 'ami-09b9b17384f68fd7c' 'ca-central-1': - AMI: 'ami-02f84cf47c23f1769' + AMI: 'ami-0e2407e55b9816758' 'ap-east-1': - AMI: 'ami-0a2115f8cc0a3956b' + AMI: 'ami-0de9d09f41c5e334c' 'ap-southeast-1': - AMI: 'ami-0f511ead81ccde020' + AMI: 'ami-082105f875acab993' 'ap-southeast-2': - AMI: 'ami-0aab712d6363da7f9' + AMI: 'ami-0210560cedcb09f07' 'eu-central-1': - AMI: 'ami-0453cb7b5f2b7fca2' + AMI: 'ami-07df274a488ca9195' 'us-east-1': - AMI: 'ami-0c2b8ca1dad447f8a' + AMI: 'ami-087c17d1fe0178315' 'us-east-2': - AMI: 'ami-0443305dabd4be2bc' + AMI: 'ami-00dfe2c7ce89a450b' 'us-west-1': - AMI: 'ami-04b6c97b14c54de18' + AMI: 'ami-011996ff98de391d1' 'us-west-2': - AMI: 'ami-083ac7c7ecf9bb9b0' + AMI: 'ami-0c2d06d50ce30b442' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/vpc/README.md b/vpc/README.md index 0e783b4ef..0af08af9a 100644 --- a/vpc/README.md +++ b/vpc/README.md @@ -9,7 +9,7 @@ To update the region map execute the following lines in your terminal: #### AMI ``` -for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210721.2-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done +for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210813.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done ``` #### NATAMI diff --git a/vpc/vpc-ssh-bastion.yaml b/vpc/vpc-ssh-bastion.yaml index 7a6720539..832699cb1 100644 --- a/vpc/vpc-ssh-bastion.yaml +++ b/vpc/vpc-ssh-bastion.yaml @@ -91,47 +91,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - AMI: 'ami-0edec67949fd25461' + AMI: 'ami-03590d67411bbd24e' 'eu-north-1': - AMI: 'ami-0d441f5643da997cb' + AMI: 'ami-0f0b4cb72cf3eadf3' 'ap-south-1': - AMI: 'ami-04db49c0fb2215364' + AMI: 'ami-0a23ccb2cdd9286bb' 'eu-west-3': - AMI: 'ami-0d49cec198762b78c' + AMI: 'ami-072056ff9d3689e7b' 'eu-west-2': - AMI: 'ami-0d26eb3972b7f8c96' + AMI: 'ami-0dbec48abfe298cab' 'eu-south-1': - AMI: 'ami-0fce326033a239d55' + AMI: 'ami-043c883e65558daa0' 'eu-west-1': - AMI: 'ami-02b4e72b17337d6c1' + AMI: 'ami-0d1bf5b68307103c2' 'ap-northeast-3': - AMI: 'ami-0e787554e61105680' + AMI: 'ami-09ec82600a05bc23a' 'ap-northeast-2': - AMI: 'ami-0a0de518b1fc4524c' + AMI: 'ami-08c64544f5cfcddd0' 'me-south-1': - AMI: 'ami-004b77593bd476317' + AMI: 'ami-0cc423da78c883d64' 'ap-northeast-1': - AMI: 'ami-09ebacdc178ae23b7' + AMI: 'ami-02892a4ea9bfa2192' 'sa-east-1': - AMI: 'ami-0f8243a5175208e08' + AMI: 'ami-09b9b17384f68fd7c' 'ca-central-1': - AMI: 'ami-02f84cf47c23f1769' + AMI: 'ami-0e2407e55b9816758' 'ap-east-1': - AMI: 'ami-0a2115f8cc0a3956b' + AMI: 'ami-0de9d09f41c5e334c' 'ap-southeast-1': - AMI: 'ami-0f511ead81ccde020' + AMI: 'ami-082105f875acab993' 'ap-southeast-2': - AMI: 'ami-0aab712d6363da7f9' + AMI: 'ami-0210560cedcb09f07' 'eu-central-1': - AMI: 'ami-0453cb7b5f2b7fca2' + AMI: 'ami-07df274a488ca9195' 'us-east-1': - AMI: 'ami-0c2b8ca1dad447f8a' + AMI: 'ami-087c17d1fe0178315' 'us-east-2': - AMI: 'ami-0443305dabd4be2bc' + AMI: 'ami-00dfe2c7ce89a450b' 'us-west-1': - AMI: 'ami-04b6c97b14c54de18' + AMI: 'ami-011996ff98de391d1' 'us-west-2': - AMI: 'ami-083ac7c7ecf9bb9b0' + AMI: 'ami-0c2d06d50ce30b442' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/vpc/vpc-vpn-bastion.yaml b/vpc/vpc-vpn-bastion.yaml index 3785a5db7..c8acc7b53 100644 --- a/vpc/vpc-vpn-bastion.yaml +++ b/vpc/vpc-vpn-bastion.yaml @@ -133,47 +133,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - AMI: 'ami-0edec67949fd25461' + AMI: 'ami-03590d67411bbd24e' 'eu-north-1': - AMI: 'ami-0d441f5643da997cb' + AMI: 'ami-0f0b4cb72cf3eadf3' 'ap-south-1': - AMI: 'ami-04db49c0fb2215364' + AMI: 'ami-0a23ccb2cdd9286bb' 'eu-west-3': - AMI: 'ami-0d49cec198762b78c' + AMI: 'ami-072056ff9d3689e7b' 'eu-west-2': - AMI: 'ami-0d26eb3972b7f8c96' + AMI: 'ami-0dbec48abfe298cab' 'eu-south-1': - AMI: 'ami-0fce326033a239d55' + AMI: 'ami-043c883e65558daa0' 'eu-west-1': - AMI: 'ami-02b4e72b17337d6c1' + AMI: 'ami-0d1bf5b68307103c2' 'ap-northeast-3': - AMI: 'ami-0e787554e61105680' + AMI: 'ami-09ec82600a05bc23a' 'ap-northeast-2': - AMI: 'ami-0a0de518b1fc4524c' + AMI: 'ami-08c64544f5cfcddd0' 'me-south-1': - AMI: 'ami-004b77593bd476317' + AMI: 'ami-0cc423da78c883d64' 'ap-northeast-1': - AMI: 'ami-09ebacdc178ae23b7' + AMI: 'ami-02892a4ea9bfa2192' 'sa-east-1': - AMI: 'ami-0f8243a5175208e08' + AMI: 'ami-09b9b17384f68fd7c' 'ca-central-1': - AMI: 'ami-02f84cf47c23f1769' + AMI: 'ami-0e2407e55b9816758' 'ap-east-1': - AMI: 'ami-0a2115f8cc0a3956b' + AMI: 'ami-0de9d09f41c5e334c' 'ap-southeast-1': - AMI: 'ami-0f511ead81ccde020' + AMI: 'ami-082105f875acab993' 'ap-southeast-2': - AMI: 'ami-0aab712d6363da7f9' + AMI: 'ami-0210560cedcb09f07' 'eu-central-1': - AMI: 'ami-0453cb7b5f2b7fca2' + AMI: 'ami-07df274a488ca9195' 'us-east-1': - AMI: 'ami-0c2b8ca1dad447f8a' + AMI: 'ami-087c17d1fe0178315' 'us-east-2': - AMI: 'ami-0443305dabd4be2bc' + AMI: 'ami-00dfe2c7ce89a450b' 'us-west-1': - AMI: 'ami-04b6c97b14c54de18' + AMI: 'ami-011996ff98de391d1' 'us-west-2': - AMI: 'ami-083ac7c7ecf9bb9b0' + AMI: 'ami-0c2d06d50ce30b442' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/wordpress/README.md b/wordpress/README.md index ff532a8ab..3642489b4 100644 --- a/wordpress/README.md +++ b/wordpress/README.md @@ -8,7 +8,7 @@ Find the documentation here: https://templates.cloudonaut.io/en/stable/wordpress To update the region map execute the following lines in your terminal: ``` -for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210721.2-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done +for region in $(aws ec2 describe-regions --query "Regions[].RegionName" --output text); do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20210813.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done ``` ### Load Test diff --git a/wordpress/wordpress-ha-aurora.yaml b/wordpress/wordpress-ha-aurora.yaml index 3cd563ac3..1bf2ac81b 100644 --- a/wordpress/wordpress-ha-aurora.yaml +++ b/wordpress/wordpress-ha-aurora.yaml @@ -196,47 +196,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - AMI: 'ami-0edec67949fd25461' + AMI: 'ami-03590d67411bbd24e' 'eu-north-1': - AMI: 'ami-0d441f5643da997cb' + AMI: 'ami-0f0b4cb72cf3eadf3' 'ap-south-1': - AMI: 'ami-04db49c0fb2215364' + AMI: 'ami-0a23ccb2cdd9286bb' 'eu-west-3': - AMI: 'ami-0d49cec198762b78c' + AMI: 'ami-072056ff9d3689e7b' 'eu-west-2': - AMI: 'ami-0d26eb3972b7f8c96' + AMI: 'ami-0dbec48abfe298cab' 'eu-south-1': - AMI: 'ami-0fce326033a239d55' + AMI: 'ami-043c883e65558daa0' 'eu-west-1': - AMI: 'ami-02b4e72b17337d6c1' + AMI: 'ami-0d1bf5b68307103c2' 'ap-northeast-3': - AMI: 'ami-0e787554e61105680' + AMI: 'ami-09ec82600a05bc23a' 'ap-northeast-2': - AMI: 'ami-0a0de518b1fc4524c' + AMI: 'ami-08c64544f5cfcddd0' 'me-south-1': - AMI: 'ami-004b77593bd476317' + AMI: 'ami-0cc423da78c883d64' 'ap-northeast-1': - AMI: 'ami-09ebacdc178ae23b7' + AMI: 'ami-02892a4ea9bfa2192' 'sa-east-1': - AMI: 'ami-0f8243a5175208e08' + AMI: 'ami-09b9b17384f68fd7c' 'ca-central-1': - AMI: 'ami-02f84cf47c23f1769' + AMI: 'ami-0e2407e55b9816758' 'ap-east-1': - AMI: 'ami-0a2115f8cc0a3956b' + AMI: 'ami-0de9d09f41c5e334c' 'ap-southeast-1': - AMI: 'ami-0f511ead81ccde020' + AMI: 'ami-082105f875acab993' 'ap-southeast-2': - AMI: 'ami-0aab712d6363da7f9' + AMI: 'ami-0210560cedcb09f07' 'eu-central-1': - AMI: 'ami-0453cb7b5f2b7fca2' + AMI: 'ami-07df274a488ca9195' 'us-east-1': - AMI: 'ami-0c2b8ca1dad447f8a' + AMI: 'ami-087c17d1fe0178315' 'us-east-2': - AMI: 'ami-0443305dabd4be2bc' + AMI: 'ami-00dfe2c7ce89a450b' 'us-west-1': - AMI: 'ami-04b6c97b14c54de18' + AMI: 'ami-011996ff98de391d1' 'us-west-2': - AMI: 'ami-083ac7c7ecf9bb9b0' + AMI: 'ami-0c2d06d50ce30b442' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref WebServerKeyName, '']] diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml index 6f10a938a..d6d1b36a0 100644 --- a/wordpress/wordpress-ha.yaml +++ b/wordpress/wordpress-ha.yaml @@ -233,47 +233,47 @@ Parameters: Mappings: RegionMap: 'af-south-1': - AMI: 'ami-0edec67949fd25461' + AMI: 'ami-03590d67411bbd24e' 'eu-north-1': - AMI: 'ami-0d441f5643da997cb' + AMI: 'ami-0f0b4cb72cf3eadf3' 'ap-south-1': - AMI: 'ami-04db49c0fb2215364' + AMI: 'ami-0a23ccb2cdd9286bb' 'eu-west-3': - AMI: 'ami-0d49cec198762b78c' + AMI: 'ami-072056ff9d3689e7b' 'eu-west-2': - AMI: 'ami-0d26eb3972b7f8c96' + AMI: 'ami-0dbec48abfe298cab' 'eu-south-1': - AMI: 'ami-0fce326033a239d55' + AMI: 'ami-043c883e65558daa0' 'eu-west-1': - AMI: 'ami-02b4e72b17337d6c1' + AMI: 'ami-0d1bf5b68307103c2' 'ap-northeast-3': - AMI: 'ami-0e787554e61105680' + AMI: 'ami-09ec82600a05bc23a' 'ap-northeast-2': - AMI: 'ami-0a0de518b1fc4524c' + AMI: 'ami-08c64544f5cfcddd0' 'me-south-1': - AMI: 'ami-004b77593bd476317' + AMI: 'ami-0cc423da78c883d64' 'ap-northeast-1': - AMI: 'ami-09ebacdc178ae23b7' + AMI: 'ami-02892a4ea9bfa2192' 'sa-east-1': - AMI: 'ami-0f8243a5175208e08' + AMI: 'ami-09b9b17384f68fd7c' 'ca-central-1': - AMI: 'ami-02f84cf47c23f1769' + AMI: 'ami-0e2407e55b9816758' 'ap-east-1': - AMI: 'ami-0a2115f8cc0a3956b' + AMI: 'ami-0de9d09f41c5e334c' 'ap-southeast-1': - AMI: 'ami-0f511ead81ccde020' + AMI: 'ami-082105f875acab993' 'ap-southeast-2': - AMI: 'ami-0aab712d6363da7f9' + AMI: 'ami-0210560cedcb09f07' 'eu-central-1': - AMI: 'ami-0453cb7b5f2b7fca2' + AMI: 'ami-07df274a488ca9195' 'us-east-1': - AMI: 'ami-0c2b8ca1dad447f8a' + AMI: 'ami-087c17d1fe0178315' 'us-east-2': - AMI: 'ami-0443305dabd4be2bc' + AMI: 'ami-00dfe2c7ce89a450b' 'us-west-1': - AMI: 'ami-04b6c97b14c54de18' + AMI: 'ami-011996ff98de391d1' 'us-west-2': - AMI: 'ami-083ac7c7ecf9bb9b0' + AMI: 'ami-0c2d06d50ce30b442' DBServerInstanceTypeMap: 'db.t3.micro': PerformanceInsights: false