old-portfolio/terraform-hideyoshi.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29 from HideyoshiSolutions/staging

Browse Source 
Staging - Implements TLS Configuration
This commit is contained in:
Vitor Hideyoshi
2024-02-08 23:35:58 -03:00
committed by GitHub
parent 48bf82f1c3 fb7fbbe617
commit 44cc9a3d03
2 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bucket/bucket.tf
View File

@@ -74,6 +74,6 @@ resource "aws_s3_bucket_cors_configuration" "default" {
cors_rule {
allowed_headers = ["*"]
allowed_methods = ["GET", "PUT", "POST", "DELETE", "HEAD"]
allowed_origins = ["${var.project_domain}"]
allowed_origins = ["https://${var.project_domain}"]
}
}

4
instances/instance.tf
View File

@@ -96,7 +96,7 @@ resource "aws_instance" "main" {
"sudo /sbin/mkswap /var/swap.1",
"sudo chmod 600 /var/swap.1",
"sudo /sbin/swapon /var/swap.1",
"echo 'curl -sfL https://get.k3s.io | K3S_TOKEN=\"${var.k3s_token}\" K3S_KUBECONFIG_MODE=644 INSTALL_K3S_EXEC=\"server --disable=traefik\" sh -' >> /home/ubuntu/setup.sh",
"echo 'curl -sfL https://get.k3s.io | K3S_TOKEN=\"${var.k3s_token}\" K3S_KUBECONFIG_MODE=644 INSTALL_K3S_EXEC=\"server --disable=traefik --tls-san=${var.project_domain}\" sh -' >> /home/ubuntu/setup.sh",
"echo 'mkdir /home/ubuntu/.kube' >> /home/ubuntu/setup.sh",
"echo 'sudo chmod 644 /etc/rancher/k3s/k3s.yaml' >> /home/ubuntu/setup.sh",
"echo 'cp /etc/rancher/k3s/k3s.yaml /home/ubuntu/.kube/k3s.yaml' >> /home/ubuntu/setup.sh",
@@ -138,7 +138,7 @@ resource "aws_instance" "worker" {
"sudo /sbin/mkswap /var/swap.1",
"sudo chmod 600 /var/swap.1",
"sudo /sbin/swapon /var/swap.1",
"echo 'curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC=\"agent\" K3S_TOKEN=\"${var.k3s_token}\" K3S_URL=\"${var.project_domain}:6443\" sh -s -' >> /home/ubuntu/setup.sh",
"echo 'curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC=\"agent\" K3S_TOKEN=\"${var.k3s_token}\" K3S_URL=\"https://${var.project_domain}:6443\" sh -s -' >> /home/ubuntu/setup.sh",
"chmod +x /home/ubuntu/setup.sh",
"while ! nc -z ${aws_instance.main.public_ip} 6443; do sleep 0.1; done",
"exec /home/ubuntu/setup.sh | tee logs.txt",