Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 to 20190823.1 (widdix#346)
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelwittig
michaelwittig authored Sep 5, 2019
1 parent 5241286 commit 06a0a03
Show file tree
Hide file tree
Showing 13 changed files with 158 additions and 141 deletions.
2 changes: 1 addition & 1 deletion ec2/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,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=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190823.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
36 changes: 19 additions & 17 deletions ec2/ec2-auto-recovery.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,39 +142,41 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-3f36be41'
AMI: 'ami-1b2fa465'
'ap-south-1':
AMI: 'ami-0d2692b6acea72ee6'
AMI: 'ami-0cb0e70f44e1a4bb5'
'eu-west-3':
AMI: 'ami-0adcddd3324248c4c'
AMI: 'ami-03b4b78aae82b30f1'
'eu-west-2':
AMI: 'ami-0d8e27447ec2c8410'
AMI: 'ami-00a1270ce1e007c27'
'eu-west-1':
AMI: 'ami-0bbc25e23a7640b9b'
AMI: 'ami-0ce71448843cb18a1'
'ap-northeast-2':
AMI: 'ami-095ca789e0549777d'
AMI: 'ami-0d097db2fb6e0f05e'
'me-south-1':
AMI: 'ami-0adec48bafcf910d5'
'ap-northeast-1':
AMI: 'ami-0c3fd0f5d33134a76'
AMI: 'ami-0ff21806645c5e492'
'sa-east-1':
AMI: 'ami-058943e7d9b9cabfb'
AMI: 'ami-0a1f49a762473adbd'
'ca-central-1':
AMI: 'ami-0d4ae09ec9361d8ac'
AMI: 'ami-085edf38cedbea498'
'ap-east-1':
AMI: 'ami-570c7726'
AMI: 'ami-d3e992a2'
'ap-southeast-1':
AMI: 'ami-01f7527546b557442'
AMI: 'ami-048a01c78f7bae4aa'
'ap-southeast-2':
AMI: 'ami-0dc96254d5535925f'
AMI: 'ami-03ed5bd63ba378bd8'
'eu-central-1':
AMI: 'ami-0cc293023f983ed53'
AMI: 'ami-00aa4671cbf840d82'
'us-east-1':
AMI: 'ami-0b898040803850657'
AMI: 'ami-0b69ea66ff7391e80'
'us-east-2':
AMI: 'ami-0d8f6eb4f641ef691'
AMI: 'ami-00c03f7f7f2ec15c3'
'us-west-1':
AMI: 'ami-056ee704806822732'
AMI: 'ami-0245d318c6788de52'
'us-west-2':
AMI: 'ami-082b5a644766e0e6f'
AMI: 'ami-04b762b4289fba92b'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion jenkins/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,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=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190823.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
36 changes: 19 additions & 17 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,39 +218,41 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-3f36be41'
AMI: 'ami-1b2fa465'
'ap-south-1':
AMI: 'ami-0d2692b6acea72ee6'
AMI: 'ami-0cb0e70f44e1a4bb5'
'eu-west-3':
AMI: 'ami-0adcddd3324248c4c'
AMI: 'ami-03b4b78aae82b30f1'
'eu-west-2':
AMI: 'ami-0d8e27447ec2c8410'
AMI: 'ami-00a1270ce1e007c27'
'eu-west-1':
AMI: 'ami-0bbc25e23a7640b9b'
AMI: 'ami-0ce71448843cb18a1'
'ap-northeast-2':
AMI: 'ami-095ca789e0549777d'
AMI: 'ami-0d097db2fb6e0f05e'
'me-south-1':
AMI: 'ami-0adec48bafcf910d5'
'ap-northeast-1':
AMI: 'ami-0c3fd0f5d33134a76'
AMI: 'ami-0ff21806645c5e492'
'sa-east-1':
AMI: 'ami-058943e7d9b9cabfb'
AMI: 'ami-0a1f49a762473adbd'
'ca-central-1':
AMI: 'ami-0d4ae09ec9361d8ac'
AMI: 'ami-085edf38cedbea498'
'ap-east-1':
AMI: 'ami-570c7726'
AMI: 'ami-d3e992a2'
'ap-southeast-1':
AMI: 'ami-01f7527546b557442'
AMI: 'ami-048a01c78f7bae4aa'
'ap-southeast-2':
AMI: 'ami-0dc96254d5535925f'
AMI: 'ami-03ed5bd63ba378bd8'
'eu-central-1':
AMI: 'ami-0cc293023f983ed53'
AMI: 'ami-00aa4671cbf840d82'
'us-east-1':
AMI: 'ami-0b898040803850657'
AMI: 'ami-0b69ea66ff7391e80'
'us-east-2':
AMI: 'ami-0d8f6eb4f641ef691'
AMI: 'ami-00c03f7f7f2ec15c3'
'us-west-1':
AMI: 'ami-056ee704806822732'
AMI: 'ami-0245d318c6788de52'
'us-west-2':
AMI: 'ami-082b5a644766e0e6f'
AMI: 'ami-04b762b4289fba92b'
Conditions:
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
36 changes: 19 additions & 17 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,39 +158,41 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-3f36be41'
AMI: 'ami-1b2fa465'
'ap-south-1':
AMI: 'ami-0d2692b6acea72ee6'
AMI: 'ami-0cb0e70f44e1a4bb5'
'eu-west-3':
AMI: 'ami-0adcddd3324248c4c'
AMI: 'ami-03b4b78aae82b30f1'
'eu-west-2':
AMI: 'ami-0d8e27447ec2c8410'
AMI: 'ami-00a1270ce1e007c27'
'eu-west-1':
AMI: 'ami-0bbc25e23a7640b9b'
AMI: 'ami-0ce71448843cb18a1'
'ap-northeast-2':
AMI: 'ami-095ca789e0549777d'
AMI: 'ami-0d097db2fb6e0f05e'
'me-south-1':
AMI: 'ami-0adec48bafcf910d5'
'ap-northeast-1':
AMI: 'ami-0c3fd0f5d33134a76'
AMI: 'ami-0ff21806645c5e492'
'sa-east-1':
AMI: 'ami-058943e7d9b9cabfb'
AMI: 'ami-0a1f49a762473adbd'
'ca-central-1':
AMI: 'ami-0d4ae09ec9361d8ac'
AMI: 'ami-085edf38cedbea498'
'ap-east-1':
AMI: 'ami-570c7726'
AMI: 'ami-d3e992a2'
'ap-southeast-1':
AMI: 'ami-01f7527546b557442'
AMI: 'ami-048a01c78f7bae4aa'
'ap-southeast-2':
AMI: 'ami-0dc96254d5535925f'
AMI: 'ami-03ed5bd63ba378bd8'
'eu-central-1':
AMI: 'ami-0cc293023f983ed53'
AMI: 'ami-00aa4671cbf840d82'
'us-east-1':
AMI: 'ami-0b898040803850657'
AMI: 'ami-0b69ea66ff7391e80'
'us-east-2':
AMI: 'ami-0d8f6eb4f641ef691'
AMI: 'ami-00c03f7f7f2ec15c3'
'us-west-1':
AMI: 'ami-056ee704806822732'
AMI: 'ami-0245d318c6788de52'
'us-west-2':
AMI: 'ami-082b5a644766e0e6f'
AMI: 'ami-04b762b4289fba92b'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion security/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,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=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190823.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
36 changes: 19 additions & 17 deletions security/auth-proxy-ha-github-orga.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,39 +132,41 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-3f36be41'
AMI: 'ami-1b2fa465'
'ap-south-1':
AMI: 'ami-0d2692b6acea72ee6'
AMI: 'ami-0cb0e70f44e1a4bb5'
'eu-west-3':
AMI: 'ami-0adcddd3324248c4c'
AMI: 'ami-03b4b78aae82b30f1'
'eu-west-2':
AMI: 'ami-0d8e27447ec2c8410'
AMI: 'ami-00a1270ce1e007c27'
'eu-west-1':
AMI: 'ami-0bbc25e23a7640b9b'
AMI: 'ami-0ce71448843cb18a1'
'ap-northeast-2':
AMI: 'ami-095ca789e0549777d'
AMI: 'ami-0d097db2fb6e0f05e'
'me-south-1':
AMI: 'ami-0adec48bafcf910d5'
'ap-northeast-1':
AMI: 'ami-0c3fd0f5d33134a76'
AMI: 'ami-0ff21806645c5e492'
'sa-east-1':
AMI: 'ami-058943e7d9b9cabfb'
AMI: 'ami-0a1f49a762473adbd'
'ca-central-1':
AMI: 'ami-0d4ae09ec9361d8ac'
AMI: 'ami-085edf38cedbea498'
'ap-east-1':
AMI: 'ami-570c7726'
AMI: 'ami-d3e992a2'
'ap-southeast-1':
AMI: 'ami-01f7527546b557442'
AMI: 'ami-048a01c78f7bae4aa'
'ap-southeast-2':
AMI: 'ami-0dc96254d5535925f'
AMI: 'ami-03ed5bd63ba378bd8'
'eu-central-1':
AMI: 'ami-0cc293023f983ed53'
AMI: 'ami-00aa4671cbf840d82'
'us-east-1':
AMI: 'ami-0b898040803850657'
AMI: 'ami-0b69ea66ff7391e80'
'us-east-2':
AMI: 'ami-0d8f6eb4f641ef691'
AMI: 'ami-00c03f7f7f2ec15c3'
'us-west-1':
AMI: 'ami-056ee704806822732'
AMI: 'ami-0245d318c6788de52'
'us-west-2':
AMI: 'ami-082b5a644766e0e6f'
AMI: 'ami-04b762b4289fba92b'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
3 changes: 2 additions & 1 deletion vpc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ $ regions=$(aws ec2 describe-regions --query "Regions[].RegionName" --output tex

#### AMI
```
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ 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=amzn2-ami-hvm-2.0.20190823.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```

#### NATAMI
Expand Down
36 changes: 19 additions & 17 deletions vpc/vpc-ssh-bastion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,39 +83,41 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-3f36be41'
AMI: 'ami-1b2fa465'
'ap-south-1':
AMI: 'ami-0d2692b6acea72ee6'
AMI: 'ami-0cb0e70f44e1a4bb5'
'eu-west-3':
AMI: 'ami-0adcddd3324248c4c'
AMI: 'ami-03b4b78aae82b30f1'
'eu-west-2':
AMI: 'ami-0d8e27447ec2c8410'
AMI: 'ami-00a1270ce1e007c27'
'eu-west-1':
AMI: 'ami-0bbc25e23a7640b9b'
AMI: 'ami-0ce71448843cb18a1'
'ap-northeast-2':
AMI: 'ami-095ca789e0549777d'
AMI: 'ami-0d097db2fb6e0f05e'
'me-south-1':
AMI: 'ami-0adec48bafcf910d5'
'ap-northeast-1':
AMI: 'ami-0c3fd0f5d33134a76'
AMI: 'ami-0ff21806645c5e492'
'sa-east-1':
AMI: 'ami-058943e7d9b9cabfb'
AMI: 'ami-0a1f49a762473adbd'
'ca-central-1':
AMI: 'ami-0d4ae09ec9361d8ac'
AMI: 'ami-085edf38cedbea498'
'ap-east-1':
AMI: 'ami-570c7726'
AMI: 'ami-d3e992a2'
'ap-southeast-1':
AMI: 'ami-01f7527546b557442'
AMI: 'ami-048a01c78f7bae4aa'
'ap-southeast-2':
AMI: 'ami-0dc96254d5535925f'
AMI: 'ami-03ed5bd63ba378bd8'
'eu-central-1':
AMI: 'ami-0cc293023f983ed53'
AMI: 'ami-00aa4671cbf840d82'
'us-east-1':
AMI: 'ami-0b898040803850657'
AMI: 'ami-0b69ea66ff7391e80'
'us-east-2':
AMI: 'ami-0d8f6eb4f641ef691'
AMI: 'ami-00c03f7f7f2ec15c3'
'us-west-1':
AMI: 'ami-056ee704806822732'
AMI: 'ami-0245d318c6788de52'
'us-west-2':
AMI: 'ami-082b5a644766e0e6f'
AMI: 'ami-04b762b4289fba92b'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
36 changes: 19 additions & 17 deletions vpc/vpc-vpn-bastion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,39 +125,41 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-3f36be41'
AMI: 'ami-1b2fa465'
'ap-south-1':
AMI: 'ami-0d2692b6acea72ee6'
AMI: 'ami-0cb0e70f44e1a4bb5'
'eu-west-3':
AMI: 'ami-0adcddd3324248c4c'
AMI: 'ami-03b4b78aae82b30f1'
'eu-west-2':
AMI: 'ami-0d8e27447ec2c8410'
AMI: 'ami-00a1270ce1e007c27'
'eu-west-1':
AMI: 'ami-0bbc25e23a7640b9b'
AMI: 'ami-0ce71448843cb18a1'
'ap-northeast-2':
AMI: 'ami-095ca789e0549777d'
AMI: 'ami-0d097db2fb6e0f05e'
'me-south-1':
AMI: 'ami-0adec48bafcf910d5'
'ap-northeast-1':
AMI: 'ami-0c3fd0f5d33134a76'
AMI: 'ami-0ff21806645c5e492'
'sa-east-1':
AMI: 'ami-058943e7d9b9cabfb'
AMI: 'ami-0a1f49a762473adbd'
'ca-central-1':
AMI: 'ami-0d4ae09ec9361d8ac'
AMI: 'ami-085edf38cedbea498'
'ap-east-1':
AMI: 'ami-570c7726'
AMI: 'ami-d3e992a2'
'ap-southeast-1':
AMI: 'ami-01f7527546b557442'
AMI: 'ami-048a01c78f7bae4aa'
'ap-southeast-2':
AMI: 'ami-0dc96254d5535925f'
AMI: 'ami-03ed5bd63ba378bd8'
'eu-central-1':
AMI: 'ami-0cc293023f983ed53'
AMI: 'ami-00aa4671cbf840d82'
'us-east-1':
AMI: 'ami-0b898040803850657'
AMI: 'ami-0b69ea66ff7391e80'
'us-east-2':
AMI: 'ami-0d8f6eb4f641ef691'
AMI: 'ami-00c03f7f7f2ec15c3'
'us-west-1':
AMI: 'ami-056ee704806822732'
AMI: 'ami-0245d318c6788de52'
'us-west-2':
AMI: 'ami-082b5a644766e0e6f'
AMI: 'ami-04b762b4289fba92b'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion wordpress/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190823.1-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```

### Load Test
Expand Down
Loading

0 comments on commit 06a0a03

Please sign in to comment.