diff --git a/ec2.tf b/ec2.tf index 804c1b0..414b82d 100644 --- a/ec2.tf +++ b/ec2.tf @@ -10,7 +10,7 @@ resource "aws_instance" "instance" { key_name = var.ssh_key vpc_security_group_ids = [aws_security_group.sg.id] - tags = { Name = "status.fediservices.nz" } + tags = { Name = var.domain } lifecycle { ignore_changes = [ @@ -24,7 +24,7 @@ resource "aws_eip" "eip" { instance = aws_instance.instance.id vpc = true - tags = { Name = "status.fediservices.nz" } + tags = { Name = var.domain } } # EBS Vol for persistance diff --git a/sg.tf b/sg.tf index 7c3f55d..9020fff 100644 --- a/sg.tf +++ b/sg.tf @@ -1,7 +1,7 @@ # Security groups to access database1.apse2 resource "aws_security_group" "sg" { - name = "status.fediservices.nz" - description = "status.fediservices.nz" + name = var.domain + description = var.domain vpc_id = aws_vpc.vpc.id } diff --git a/template.tf b/template.tf index 2a6c1d2..a6e824e 100644 --- a/template.tf +++ b/template.tf @@ -6,5 +6,6 @@ data "template_file" "userdata" { region = data.aws_region.current.name data_root = "/data" volume = aws_ebs_volume.ebs.id + domain = var.domain } } diff --git a/templates/userdata.tpl b/templates/userdata.tpl index 981f66a..f0be0f1 100644 --- a/templates/userdata.tpl +++ b/templates/userdata.tpl @@ -58,11 +58,34 @@ sudo resize2fs /dev/$device sudo chown ubuntu:ubuntu -R ${data_root} # Run it! -docker run -d \ - --restart=always \ - -p 3001:3001 \ - -v ${data_root}/uptime-kuma:/app/data \ - --name uptime-kuma \ - louislam/uptime-kuma +cat < docker-compose.yml +version: '3' +networks: + default: + name: 'proxy_network' +services: + uptime-kuma: + image: louislam/uptime-kuma:1 + restart: unless-stopped + volumes: + - ${data_root}/uptime-kuma:/app/data + labels: + caddy: ${domain} + caddy.reverse_proxy: "* {{ '{{upstreams 3001}}'}}" + caddy: + image: "lucaslorentz/caddy-docker-proxy:ci-alpine" + ports: + - "80:80" + - "443:443" + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + - ${data_root}/caddy_data:/data + restart: unless-stopped + environment: + - CADDY_INGRESS_NETWORKS=proxy_network + +EOF + +docker compose up -d sudo snap start amazon-ssm-agent \ No newline at end of file diff --git a/variables.tf b/variables.tf index cc2643d..838fe11 100644 --- a/variables.tf +++ b/variables.tf @@ -8,5 +8,10 @@ variable "instance_type" { default = "t4g.nano" } +variable "domain" { + type = string + default = "status.fediservices.nz" +} + variable "AWS_ACCESS_KEY_ID" {} variable "AWS_SECRET_ACCESS_KEY" {}