Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from widdix:master #15

Merged
merged 3 commits into from
Sep 5, 2019
Merged

[pull] master from widdix:master #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5241286
[Security] wordpress/* - Update WordPress to 5.2.3 (#345)
michaelwittig Sep 5, 2019
06a0a03
[Security] * - Update Amazon Linux 2 to 20190823.1 (#346)
michaelwittig Sep 5, 2019
305efd6
[Security] ecs/cluster - Update Amazon Linux 2 optimized for ECS to 2…
michaelwittig Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ec2/README.md
View file
Open in desktop
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
Open in desktop
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 ecs/README.md
View file
Open in desktop
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-ecs-hvm-2.0.20190709-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-ecs-hvm-2.0.20190815-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done
```
36 changes: 19 additions & 17 deletions ecs/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,39 +201,41 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
ECSAMI: 'ami-059aa04f0c253ad6b'
ECSAMI: 'ami-063b45c1e31fdc5d2'
'ap-south-1':
ECSAMI: 'ami-0a8bf4e187339e2c1'
ECSAMI: 'ami-0b7f1d57770573a75'
'eu-west-3':
ECSAMI: 'ami-0d260f3e5ccd06043'
ECSAMI: 'ami-084e49fa6ca9c8794'
'eu-west-2':
ECSAMI: 'ami-0de1dc478496a9e9b'
ECSAMI: 'ami-010624faf51b049d3'
'eu-west-1':
ECSAMI: 'ami-0ae254c8a2d3346a7'
ECSAMI: 'ami-02bf9e90a6e30dc74'
'ap-northeast-2':
ECSAMI: 'ami-0accbb5aa909be7bf'
ECSAMI: 'ami-000fbda700ba8fe9d'
'me-south-1':
ECSAMI: 'ami-0375ec9d8a8bcf612'
'ap-northeast-1':
ECSAMI: 'ami-04a735b489d2a0320'
ECSAMI: 'ami-0e37e42dff65024ae'
'sa-east-1':
ECSAMI: 'ami-038707d64e5b8e7ba'
ECSAMI: 'ami-051d98f19acea0389'
'ca-central-1':
ECSAMI: 'ami-01c07ee95e77abba8'
ECSAMI: 'ami-052de4ecee980719c'
'ap-east-1':
ECSAMI: 'ami-02252d984c7e3595d'
ECSAMI: 'ami-05bfc466e50bdfb65'
'ap-southeast-1':
ECSAMI: 'ami-05c6d22d98f97471c'
ECSAMI: 'ami-05357ea4dad5e2cf4'
'ap-southeast-2':
ECSAMI: 'ami-039bb4c3a7946ce19'
ECSAMI: 'ami-0c7dea114481e059d'
'eu-central-1':
ECSAMI: 'ami-0650e7d86452db33b'
ECSAMI: 'ami-0e1d30823ff9f8459'
'us-east-1':
ECSAMI: 'ami-0fac5486e4cff37f4'
ECSAMI: 'ami-0b16d80945b1a9c7d'
'us-east-2':
ECSAMI: 'ami-0dca97e7cde7be3d5'
ECSAMI: 'ami-0e7c12c1bedd6bf21'
'us-west-1':
ECSAMI: 'ami-0c6e63b58aac1048e'
ECSAMI: 'ami-08a12265d9e050d57'
'us-west-2':
ECSAMI: 'ami-0e5e051fd0b505db6'
ECSAMI: 'ami-0e434a58221275ed4'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion jenkins/README.md
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading