Moving remaining s3 configuration to its own folder

infra/Makefile

@@ -1,24 +0,0 @@
-plan=out.plan
-
-SHELL := /bin/bash
-
-$(plan): *.tf
-	source secrets/set-env.sh && terraform plan -input=false -out $(plan)
-
-push: build
-	source secrets/set-env.sh && terraform apply $(plan)
-
-refresh:
-	source secrets/set-env.sh && terraform apply -refresh-only
-
-test:
-	terraform validate
-
-
-rip:
-	source secrets/set-env.sh && terraform destroy
-
-clean:
-	rm -f $(plan)
-
-.PHONY: test build clean push rip

infra/data.tf

@@ -1,12 +0,0 @@
-data "aws_vpc" "athens" {
-  id = var.vpc_id
-}
-
-data "aws_subnet" "delphi" {
-  id = "subnet-0a1943f26e4338cf6"
-}
-
-data "aws_subnet" "crete" {
-  id = "subnet-09302319a6678643f"
-}
-

infra/local.tf

@@ -1,13 +0,0 @@
-locals {
-  # ECR 
-  repos = [
-    "reverse-proxy",
-  ]
-  buckets = [
-    "shockrah.xyz",
-    "resume.shockrah.xyz"
-  ]
-  nginx_name = "${var.athens_prefix}-nginx-static-content"
-  nginx_hp_check_interval = 300
-}
-

infra/s3/Makefile

@@ -0,0 +1,24 @@
+plan=out.plan
+
+SHELL := /bin/bash
+
+$(plan): *.tf
+	source ../secrets/set-env.sh && terraform plan -input=false -out $(plan)
+
+push: build
+	source ../secrets/set-env.sh && terraform apply $(plan)
+
+refresh:
+	source ../secrets/set-env.sh && terraform apply -refresh-only
+
+test:
+	terraform validate
+
+
+rip:
+	source ../secrets/set-env.sh && terraform destroy
+
+clean:
+	rm -f $(plan)
+
+.PHONY: test build clean push rip

infra/s3/backend.tf

@@ -2,7 +2,7 @@ terraform {
   required_version = ">= 0.13"
   backend "s3" {
       bucket  = "project-athens"
-      key     = "infra/state/build.tfstate"
+      key     = "infra/s3/state/build.tfstate"
       region  = "us-west-1"
       encrypt = true
   }

infra/s3/local.tf

@@ -0,0 +1,7 @@
+locals {
+  buckets = [
+    "shockrah.xyz",
+    "resume.shockrah.xyz"
+  ]
+}
+

infra/s3/s3.tf

@@ -0,0 +1,17 @@
+resource "aws_s3_bucket" "static-content" {
+  for_each = {
+    for idx, record in local.buckets:
+      idx => record
+  }
+  
+  bucket = each.value
+
+  tags = {
+    Name = each.value
+    Description = "Static content"
+  }
+}
+
+
+
+

infra/s3/website-config.tf

@@ -1,17 +1,3 @@
-resource "aws_s3_bucket" "static-content" {
-  for_each = {
-    for idx, record in local.buckets:
-      idx => record
-  }
-  
-  bucket = each.value
-
-  tags = {
-    Name = each.value
-    Description = "Static content"
-  }
-}
-
 ##################################################################
 # Below are the acl components for each bucket to make them public
 ##################################################################
@@ -42,8 +28,6 @@ resource "aws_s3_bucket_public_access_block" "site" {
   ignore_public_acls  = false
   restrict_public_buckets = false
 }
-
-
 # Set a policy on the bucket to allow reads from anywhere
 resource "aws_s3_bucket_policy" "site" {
   for_each = toset(local.buckets)
@@ -66,3 +50,4 @@ resource "aws_s3_bucket_policy" "site" {
 }
 
 
+