conflatorio

6 files changed, 32 insertions, 31 deletions

diff --git a/terraform/conflatorio-docker/traefik.tf b/terraform/conflatorio-docker/traefik.tf
index a1cedec..ebc1ea0 100644
--- a/terraform/conflatorio-docker/traefik.tf
+++ b/terraform/conflatorio-docker/traefik.tf
@@ -1,16 +1,10 @@
 resource "docker_network" "traefik" {
   name = "traefik"
-  #  ipv6 = true
+  ipv6 = true
 
   ipam_config {
-    gateway = "172.20.0.1"
-    subnet  = "172.20.0.0/16"
+    subnet  = "fdf3:aad9:a885:77dd:aaaa::/120"
   }
-
-  #  ipam_config {
-  #    subnet  = "fd00:dead:beef::/48"
-  #    gateway = "fd00:dead:beef::1"
-  #  }
 }
 
 resource "docker_image" "traefik" {
@@ -27,22 +21,28 @@ resource "docker_container" "traefik" {
     name = docker_network.traefik.name
   }
 
+#  ports {
+#    internal = 80
+#    external = 80
+#    ip       = "192.168.10.147"
+#  }
+#
+#  ports {
+#    internal = 443
+#    external = 443
+#    ip       = "192.168.10.147"
+#  }
+
   ports {
     internal = 80
     external = 80
-    ip       = "192.168.10.147"
-  }
-
-  ports {
-    internal = 443
-    external = 443
-    ip       = "192.168.10.147"
+    ip       = "fdf3:aad9:a885:77dd::2"
   }
 
   ports {
     internal = 443
     external = 443
-    ip       = "fdf3:aad9:a885:b3a::3"
+    ip       = "fdf3:aad9:a885:77dd::2"
   }
 
   command = [
diff --git a/terraform/dns/vpn-cname.tf b/terraform/dns/vpn-cname.tf
index 48dbbda..1fcf29d 100644
--- a/terraform/dns/vpn-cname.tf
+++ b/terraform/dns/vpn-cname.tf
@@ -1,3 +1,10 @@
+resource "linode_domain_record" "vpn-conflatorio" {
+  domain_id   = linode_domain.root.id
+  name        = "conflatorio.vpn"
+  record_type = "AAAA"
+  target      = "fdf3:aad9:a885:77dd::2"
+}
+
 resource "linode_domain_record" "vpn-unifi" {
   domain_id   = linode_domain.root.id
   name        = "unifi.vpn"
diff --git a/terraform/dns/vpn.tf b/terraform/dns/vpn.tf
index 4ed030b..10a1d8e 100644
--- a/terraform/dns/vpn.tf
+++ b/terraform/dns/vpn.tf
@@ -11,12 +11,6 @@ resource "linode_domain_record" "vpn-birgitte" {
   record_type = "AAAA"
   target      = "fdf3:aad9:a885:0b3a::2"
 }
-resource "linode_domain_record" "vpn-conflatorio" {
-  domain_id   = linode_domain.root.id
-  name        = "conflatorio.vpn"
-  record_type = "AAAA"
-  target      = "fdf3:aad9:a885:77dd::2"
-}
 resource "linode_domain_record" "vpn-arius" {
   domain_id   = linode_domain.root.id
   name        = "arius.vpn"
diff --git a/terraform/unifi-controller/main.tf b/terraform/unifi-controller/main.tf
index e972e38..3bf81ae 100644
--- a/terraform/unifi-controller/main.tf
+++ b/terraform/unifi-controller/main.tf
@@ -25,8 +25,8 @@ locals {
   domain_name = "unifi.vpn.trygvis.io"
 }
 
-variable "foo" {}
-
-output "bar" {
-  value = var.foo.value
-}
+# variable "foo" {}
+#
+# output "bar" {
+#   value = var.foo.value
+# }
diff --git a/terraform/unifi-controller/terragrunt.hcl b/terraform/unifi-controller/terragrunt.hcl
index 35c1b74..5236c23 100644
--- a/terraform/unifi-controller/terragrunt.hcl
+++ b/terraform/unifi-controller/terragrunt.hcl
@@ -6,6 +6,6 @@ dependency "docker" {
   config_path = "../conflatorio-docker"
 }
 
-inputs = {
-  vpc_id = dependency.docker.outputs.foo
-}
+# inputs = {
+#   vpc_id = dependency.docker.outputs.foo
+# }
diff --git a/terraform/unifi-controller/unifi.tf b/terraform/unifi-controller/unifi.tf
index c1ed4d7..93fe008 100644
--- a/terraform/unifi-controller/unifi.tf
+++ b/terraform/unifi-controller/unifi.tf
@@ -44,7 +44,7 @@ resource "docker_container" "unifi-controller" {
       internal = ports.value["port"]
       external = ports.value["port"]
       protocol = ports.value["proto"]
-      ip       = "192.168.10.3"
+      ip       = "fdf3:aad9:a885:77dd::2"
     }
   }