atlas: don't use cloudflare tunnels

2 files changed, 28 insertions, 12 deletions

diff --git a/terraform/dns.tf b/terraform/dns.tf
index cd914bf..31bd9d6 100644
--- a/terraform/dns.tf
+++ b/terraform/dns.tf
@@ -28,7 +28,6 @@ locals {
     }
   ]])
 
-  getchoo_tunnels = data.cloudflare_zero_trust_tunnel_cloudflared.getchoo_tunnels
   getchoo_records = [
     {
       name    = "@"
@@ -47,13 +46,13 @@ locals {
     },
     {
       name    = "miniflux"
-      type    = "CNAME"
-      content = "${local.getchoo_tunnels["atlas-nginx"].id}.cfargotunnel.com"
+      type    = "A"
+      content = resource.oci_core_instance.atlas.public_ip
     },
     {
       name    = "git"
-      type    = "CNAME"
-      content = "${local.getchoo_tunnels["atlas-nginx"].id}.cfargotunnel.com"
+      type    = "A"
+      content = resource.oci_core_instance.atlas.public_ip
     },
     {
       name    = "@"
@@ -63,13 +62,6 @@ locals {
   ]
 }
 
-data "cloudflare_zero_trust_tunnel_cloudflared" "getchoo_tunnels" {
-  for_each = toset(["atlas-nginx"])
-
-  account_id = var.cloudflare_account_id
-  name       = each.key
-}
-
 resource "cloudflare_record" "getchoo_com" {
   for_each = { for record in local.getchoo_records : "${record.name}-${record.type}" => record }
 
diff --git a/terraform/oci.tf b/terraform/oci.tf
index 704ff2c..9801e3b 100644
--- a/terraform/oci.tf
+++ b/terraform/oci.tf
@@ -55,4 +55,28 @@ resource "oci_core_security_list" "borealis_global" {
     protocol = "1"
     source   = "10.0.0.0/16"
   }
+
+  ingress_security_rules {
+    description = "Allow HTTP traffic"
+
+    protocol = "6"
+    source   = "0.0.0.0/0"
+
+    tcp_options {
+      min = 80
+      max = 80
+    }
+  }
+
+  ingress_security_rules {
+    description = "Allow HTTPS traffic"
+
+    protocol = "6"
+    source   = "0.0.0.0/0"
+
+    tcp_options {
+      min = 443
+      max = 443
+    }
+  }
 }