Skip to content

Commit 5d7699b

Browse files
authored
Note about Elastic IP for CloudFront EC2 custom origin
1 parent dd40cb1 commit 5d7699b

3 files changed

+17
-7
lines changed

AmazonLinux-2-LAMP-server.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ Parameters:
655655
Default: "No"
656656
originType:
657657
Type: String
658-
Description: VPC Origin (https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-vpc-origins.html)
658+
Description: Enable Elastic IP if using EC2 custom origin
659659
AllowedValues:
660660
- "EC2"
661661
- "VPC Origin"

AmazonLinux-2023-LAMP-server.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ Parameters:
255255
Type: String
256256
Description: https://aws.amazon.com/ebs/general-purpose/
257257
AllowedValues:
258-
- "gp3"
259-
- "gp2"
260-
Default: "gp3"
258+
- gp3
259+
- gp2
260+
Default: gp3
261261

262262
enableBackup:
263263
Type: String
@@ -646,7 +646,7 @@ Parameters:
646646
Default: "No"
647647
originType:
648648
Type: String
649-
Description: VPC Origin (https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-vpc-origins.html)
649+
Description: Enable Elastic IP if using EC2 custom origin
650650
AllowedValues:
651651
- "EC2"
652652
- "VPC Origin"
@@ -1253,7 +1253,7 @@ Resources:
12531253
12541254
# Update OS
12551255
dnf update -q -y
1256-
sleep 30
1256+
sleep 15
12571257
12581258
# AWS CLI
12591259
echo "export AWS_CLI_AUTO_PROMPT=on-partial" >> /home/ec2-user/.bashrc

UbuntuLinux-LAMP-server.yaml

+11-1
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ Parameters:
669669
Default: "No"
670670
originType:
671671
Type: String
672-
Description: VPC Origin (https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-vpc-origins.html)
672+
Description: Enable Elastic IP if using EC2 custom origin
673673
AllowedValues:
674674
- "EC2"
675675
- "VPC Origin"
@@ -1533,6 +1533,8 @@ Resources:
15331533
sed -i "s/enabled=1/enable=0/g" /etc/default/apport
15341534
apt-get remove -q -y ubuntu-report whoopsie apport
15351535
apt-get autoremove -q -y
1536+
# Disable upgrade prompt: https://help.ubuntu.com/community/Upgrades#Upgrade_policy
1537+
sed -i "s/Prompt=lts/Prompt=never/g" /etc/update-manager/release-upgrades
15361538
15371539
rm -f ${!0}
15381540
mode: "000740"
@@ -1546,6 +1548,12 @@ Resources:
15461548
mode: "000644"
15471549
owner: "ubuntu"
15481550
group: "ubuntu"
1551+
"/home/ubuntu/.config/gnome-initial-setup-done":
1552+
content: |
1553+
yes
1554+
mode: "000664"
1555+
owner: "ubuntu"
1556+
group: "ubuntu"
15491557
commands:
15501558
install:
15511559
command: "/root/install-dcv.sh > /var/log/install-dcv.log 2>&1"
@@ -1907,8 +1915,10 @@ Resources:
19071915
systemctl stop apt-daily.timer apt-daily-upgrade.timer
19081916
apt-get clean all
19091917
apt-get update -q
1918+
sleep 10
19101919
apt-get install -q -y procps
19111920
pkill apt
1921+
pkill dpkg
19121922
apt-get install -q -y wget tmux unzip tar curl sed
19131923

19141924
# CfN scripts: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-helper-scripts-reference.html

0 commit comments

Comments
 (0)