5 files changed, 44 insertions, 35 deletions

diff --git a/terraform/dns/dn42.tf b/terraform/dns/dn42.tf
index c7aab96..e23af28 100644
--- a/terraform/dns/dn42.tf
+++ b/terraform/dns/dn42.tf
@@ -11,7 +11,7 @@ resource "linode_domain_record" "dn42-coregonus" {
   domain_id   = linode_domain.root.id
   name        = "coregonus.dn42"
   record_type = "AAAA"
-  target      = "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+  target      = "fdb1:4242:3538:2009::4"
 }
 
 resource "linode_domain_record" "dn42-danneri" {
@@ -77,6 +77,13 @@ resource "linode_domain_record" "dn42-lhn2-z2m" {
   target      = "fdb1:4242:3538:2008:9aed:e460:1711:7dd"
 }
 
+resource "linode_domain_record" "dn42-lhn2ix" {
+  domain_id   = linode_domain.root.id
+  name        = "lhn2ix.dn42"
+  record_type = "AAAA"
+  target      = "fdb1:4242:3538:2008::1"
+}
+
 resource "linode_domain_record" "dn42-lhn2pi" {
   domain_id   = linode_domain.root.id
   name        = "lhn2pi.dn42"
diff --git a/terraform/dns/trygvis.tf b/terraform/dns/trygvis.tf
index 5dfc8cb..a19efcf 100644
--- a/terraform/dns/trygvis.tf
+++ b/terraform/dns/trygvis.tf
@@ -176,7 +176,7 @@ resource "linode_domain_record" "kv24ix" {
   domain_id   = linode_domain.root.id
   name        = "kv24ix"
   record_type = "A"
-  target      = "81.166.205.176"
+  target      = "81.166.17.37"
 }
 
 resource "linode_domain_record" "lhn2" {
diff --git a/terraform/garasjepi-zigbee2mqtt/main.tf b/terraform/garasjepi-zigbee2mqtt/main.tf
index 1321115..df23aea 100644
--- a/terraform/garasjepi-zigbee2mqtt/main.tf
+++ b/terraform/garasjepi-zigbee2mqtt/main.tf
@@ -12,9 +12,9 @@ provider "docker" {
 }
 
 locals {
-  host         = "garasjepi.dn42.trygvis.io"
-  version      = "2.3.0"
-  public_ip    = module.ipam.hosts.garasjepi.address
+  host      = "garasjepi.dn42.trygvis.io"
+  version   = "2.6.0"
+  public_ip = module.ipam.hosts.garasjepi.address
 }
 
 module "ipam" {
diff --git a/terraform/ipam6/ipam6.tf b/terraform/ipam6/ipam6.tf
index 08ad9a0..84c7a87 100644
--- a/terraform/ipam6/ipam6.tf
+++ b/terraform/ipam6/ipam6.tf
@@ -54,24 +54,6 @@ output "networks" {
         }
       }
     }
-    coregonus_dn42 = {
-      range   = "fdb1:4242:3538:2005::/64"
-      address = "fdb1:4242:3538:2005::"
-      prefix  = "64"
-      hosts = {
-        kjell = {
-          address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
-          prefix : "64"
-        }
-      }
-    }
-    coregonus_docker = {
-      range   = "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
-      address = "fdb1:4242:3538:2005:df01:676a:ec28:a00"
-      prefix  = "120"
-      hosts = {
-      }
-    }
     kv24_pub = {
       range   = "2a01:799:111d:1801::/64"
       address = "2a01:799:111d:1801::"
@@ -100,8 +82,8 @@ output "networks" {
           address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
           prefix : "64"
         }
-        coregonus = {
-          address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+        kjell = {
+          address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
           prefix : "64"
         }
       }
@@ -129,6 +111,10 @@ output "networks" {
       address = "fdb1:4242:3538:2008::"
       prefix  = "64"
       hosts = {
+        lhn2ix = {
+          address : "fdb1:4242:3538:2008::1"
+          prefix : "128"
+        }
         lhn2pi = {
           address : "fdb1:4242:3538:2008::ffff"
           prefix : "128"
@@ -155,6 +141,17 @@ output "networks" {
         }
       }
     }
+    lhn2_service = {
+      range   = "fdb1:4242:3538:2009::/64"
+      address = "fdb1:4242:3538:2009::"
+      prefix  = "64"
+      hosts = {
+        coregonus = {
+          address : "fdb1:4242:3538:2009::4"
+          prefix : "64"
+        }
+      }
+    }
     danneri_cluster = {
       range   = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa::/112"
       address = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa:0"
@@ -193,10 +190,6 @@ output "hosts" {
       address : "fdb1:4242:3538:2004::ffff"
       prefix : "128"
     }
-    kjell = {
-      address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
-      prefix : "64"
-    }
     kv24ix = {
       address : "fdb1:4242:3538:2006::ffff"
       prefix : "128"
@@ -213,14 +206,18 @@ output "hosts" {
       address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
       prefix : "64"
     }
-    coregonus = {
-      address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+    kjell = {
+      address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
       prefix : "64"
     }
     hash = {
       address : "fdb1:4242:3538:2007::ffff"
       prefix : "128"
     }
+    lhn2ix = {
+      address : "fdb1:4242:3538:2008::1"
+      prefix : "128"
+    }
     lhn2pi = {
       address : "fdb1:4242:3538:2008::ffff"
       prefix : "128"
@@ -245,5 +242,9 @@ output "hosts" {
       address : "fdb1:4242:3538:2008:5054:ff:fe4d:96c"
       prefix : "128"
     }
+    coregonus = {
+      address : "fdb1:4242:3538:2009::4"
+      prefix : "64"
+    }
   }
 }
diff --git a/terraform/lhn2pi-zigbee2mqtt/main.tf b/terraform/lhn2pi-zigbee2mqtt/main.tf
index 2857b99..f9a6adf 100644
--- a/terraform/lhn2pi-zigbee2mqtt/main.tf
+++ b/terraform/lhn2pi-zigbee2mqtt/main.tf
@@ -12,8 +12,8 @@ provider "docker" {
 }
 
 locals {
-  host = "lhn2pi.dn42.trygvis.io"
-  docker_image = "koenkk/zigbee2mqtt:1.42.0"
+  host      = "lhn2pi.dn42.trygvis.io"
+  version   = "2.3.0"
   public_ip = module.ipam.hosts.lhn2pi.address
 }
 
@@ -24,6 +24,7 @@ module "ipam" {
 module "zigbee2mqtt" {
   source = "../modules/zigbee2mqtt"
 
-  public_ip = local.public_ip
-  serial_port = "/dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_DE2688076-if00"
+  docker_version = local.version
+  public_ip      = local.public_ip
+  serial_port    = "/dev/serial/by-id/usb-dresden_elektronik_ingenieurtechnik_GmbH_ConBee_II_DE2688076-if00"
 }