Skip to content

Minor improvements and fixes to #1 #4

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

Open
mmeidlinger wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Minor improvements and fixes to #1 #4

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e496b1c
:sparkles: Moving to gp3 and making the root volume size a parameter
mmeidlinger May 6, 2024
aade325
:art: Unique resource names to allow co-existance of cloudformation s…
mmeidlinger May 6, 2024
b564fce
:art: Install duplicity via snap rather than pip
mmeidlinger May 6, 2024
bdefaf7
:zap: Add loopback address for server FQDN to /etc/hosts
mmeidlinger May 6, 2024
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
22 changes: 15 additions & 7 deletions template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ Parameters:
Description: Managed AMI ID for EC2 Instance
Type : AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>
Default: '/aws/service/canonical/ubuntu/server/jammy/stable/current/amd64/hvm/ebs-gp2/ami-id'
InstanceVolumeSize:
Description: Size of Instance root volume in GB
Type : String
Default: 10
InstanceDns:
Description: DNS name of Instance (within the 'MailInABoxDomain')
Type: String
Expand Down Expand Up @@ -169,7 +173,7 @@ Resources:
InstanceRole:
Type: AWS::IAM::Role
Properties:
RoleName: MailInABoxInstanceRole
RoleName: !Sub MailInABoxInstanceRole-${AWS::StackName}
AssumeRolePolicyDocument:
Version: 2012-10-17
Statement:
Expand Down Expand Up @@ -249,7 +253,7 @@ Resources:
InstanceProfile:
Type: AWS::IAM::InstanceProfile
Properties:
InstanceProfileName: MailInABoxInstanceProfile
InstanceProfileName: !Sub MailInABoxInstanceProfile-${AWS::StackName}
Roles:
- !Ref InstanceRole

Expand Down Expand Up @@ -279,8 +283,8 @@ Resources:
BlockDeviceMappings:
- DeviceName: /dev/sda1
Ebs:
VolumeType: gp2
VolumeSize: 8
VolumeType: gp3
VolumeSize: !Ref InstanceVolumeSize
DeleteOnTermination: true
Encrypted: true
Tags:
Expand All @@ -302,9 +306,9 @@ Resources:
unzip \
intltool \
python-is-python3
pip3 install duplicity==1.0.1
# snap install duplicity --classic
# ln -s /snap/bin/duplicity /usr/bin/duplicity

# Install duplicity via snap
snap install duplicity --classic && ln -s /snap/bin/duplicity /usr/local/sbin/

# Install awscli and CloudFormation helper scripts
cd /tmp
Expand All @@ -331,6 +335,8 @@ Resources:
else
export PUBLIC_IP="${InstanceEIP}"
fi
echo "127.0.0.1 $PRIMARY_HOSTNAME" >> /etc/hosts

# Setup Admin Account.
export EMAIL_ADDR="admin@${MailInABoxDomain}"
# If no admin password is specified generate a random one. In that case, we upload this randomly genereated PW to SSM if it's a fresh install
Expand Down Expand Up @@ -391,6 +397,8 @@ Resources:
cd /opt/mailinabox/ && setup/start.sh

# ---------------- POST INSTALL
# Get rid of duplicity installed by MIAB
apt-get remove -o DPkg::Lock::Timeout=120 -y duplicity && ln -s /snap/bin/duplicity /usr/bin/
# Configure networking according to https://aws.amazon.com/premiumsupport/knowledge-center/ec2-static-dns-ubuntu-debian/
INTERFACE=$(ip route list | grep default | grep -E 'dev (\w+)' -o | awk '{print $2}')
cat <<EOT > /etc/netplan/99-custom-dns.yaml
Expand Down