From bea9f708c786432ec13fa1f3b1243c4c23c43724 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sun, 14 Jan 2024 13:19:55 -0800 Subject: [PATCH] refactor: move z2m to tei --- systems/tei/cloudflared.nix | 2 +- systems/tei/nixos.nix | 10 +--------- systems/tei/secrets.yaml | 5 +++-- systems/tewi/nixos.nix | 1 - systems/tewi/secrets.yaml | 5 ++--- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/systems/tei/cloudflared.nix b/systems/tei/cloudflared.nix index 4066ec45..a537c5b2 100644 --- a/systems/tei/cloudflared.nix +++ b/systems/tei/cloudflared.nix @@ -41,7 +41,7 @@ in { default = "http_status:404"; ingress = listToAttrs [ (ingressForNginx { host = config.networking.domain; inherit hostName; }) - (ingressForNginx { host = (systemFor "tewi").services.zigbee2mqtt.domain; inherit hostName; }) + (ingressForNginx { host = config.services.zigbee2mqtt.domain; inherit hostName; }) (ingressForHass { inherit hostName; }) (ingressForVouch { inherit hostName; }) (ingressForKanidm { inherit hostName; }) diff --git a/systems/tei/nixos.nix b/systems/tei/nixos.nix index 25d2672e..611ddf9c 100644 --- a/systems/tei/nixos.nix +++ b/systems/tei/nixos.nix @@ -18,20 +18,12 @@ nixos.kanidm nixos.mosquitto nixos.home-assistant + nixos.zigbee2mqtt nixos.syncplay ./cloudflared.nix ]; sops.defaultSopsFile = ./secrets.yaml; - services.nginx.access.zigbee2mqtt = let - inherit (meta.network.nodes) tewi; - z2m = tewi.services.zigbee2mqtt; - in { - inherit (z2m) domain; - inherit (z2m.settings.frontend) port; - host = tewi.networking.access.hostnameForNetwork.tail; - }; - system.stateVersion = "23.11"; } diff --git a/systems/tei/secrets.yaml b/systems/tei/secrets.yaml index 76354bc6..c9aebb22 100644 --- a/systems/tei/secrets.yaml +++ b/systems/tei/secrets.yaml @@ -6,6 +6,7 @@ espresense-pass: ENC[AES256_GCM,data:EqWTlLrspkYMrIzpukHZgw==,iv:AGmodebSHxsm353 hass-pass: ENC[AES256_GCM,data:eAAxGpFi+wIKoSUciDs=,iv:DEyRKpdIWf5sCFBf+p4LtReezYrHCIS1m9ukZQAJfjw=,tag:6ygX5KyKO0u/unpu8BtMDg==,type:str] systemd-pass: ENC[AES256_GCM,data:O5Ksb8m01wuL0OzCD6+8Lg==,iv:9ZdJtkzJNQFqFsaR439zlANilOeVSjZu5qSMedxSmnc=,tag:ArTASOcpgsUqSq+X2fjbHw==,type:str] z2m-pass: ENC[AES256_GCM,data:sQ5we47mb/5/PdKaTqPeeA==,iv:jm77q/9XGoQ/sFogbz09shl2yCLhve75QWuH9JNB+Oc=,tag:DywjElUcCc0i1wmOrXqJkw==,type:str] +z2m-secret: ENC[AES256_GCM,data:WCy0VJGcsQTEcPlQOECS52aF1kUhsr3w16Ou9y5Jk+jHE3f1u1sfwwIANg5oKEmA1l+AiBfC0yPB8MC0QTUsfSA97RLrRx+QQzeNnqQJrCs/IDAizXFi00Fq0kfxVHGEVCnvswI9ImFL0YOPQmE=,iv:rt768viqNVYlhzJkSpJGS4M9PRJusT0ju1ZalFFfPDU=,tag:8dbPRCftPqL3GgP0+ix67g==,type:str] postgresql-init: ENC[AES256_GCM,data:AJY1PhgQ/vPYAugA+oqlm2CUjI+RZ3zVOd2zdMMtFt+uLmcxoAyap/zxvVDzCzzNY/jqAJnUaAr1aYw9Nd2icSMurR4=,iv:S4d4+1ncVlEzy50eU1lyPi3gPC+yvVZe6kGZa+oK2KU=,tag:U98pYwYf3sJRmB7Ac8g9Fw==,type:str] cloudflared-tunnel-apartment: ENC[AES256_GCM,data:ysak+T+01jwznciOLY8xq6vkL+7ELiby7EBoEU2fdJSblsnd6EX736vkNZQV8QznDy5hdJtMLddFGSxUHgWujkFIK7Ra8dbK+QoYLdEmgkaZqyHy95fWwkjUc4d8OyxPA4YVRfGYh2NOBhE++YXy7zeZbvlau55CydQT9EyiCh1QkJwCURfG65iCJ7Ml36X+GeB4F4i1JZsvqsz4mXhP9WgqgzwuWA==,iv:PHRsxe+0P20TwT/a14AeiLjh5RFbY1zm9HKaIiunTw8=,tag:/z4dsGKjKz5l6ISL0lX0KQ==,type:str] cloudflared-tunnel-apartment-deluge: ENC[AES256_GCM,data:Itq8yrIwCsvc3E2KOijK8TJqdw==,iv:+MMas0vLUb5p0kvXduMFa0D/nxkIZ6rOG9EpTjnCL0U=,tag:rD0NPDfP+wemrEsFbN/ZXA==,type:str] @@ -27,8 +28,8 @@ sops: bGU0VHd0aFhHRC91WHh0Z0Y4TTE5QzgKpHehWfoJT4F1TtMHJ0tZkoJAPFAihQ7T aunsQeLHJkHv1eWKpraTmo+04GVZofwId/1TtOContveBynfxcuG7Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-14T19:43:13Z" - mac: ENC[AES256_GCM,data:3xc5w8piwTy/JDZEDdbSZdxxw7Qn/r3EVx3L43ARazB1DsoWSYXQTYZJkx0Gl9j8zVsh4CM/DWu+59SWMW7bQOOFlj+ck/qrAad/YaIuxD1I//DaAfXUKxC1ICcekzPzC2/LyGMvbTAwefR4+WxxvZ6kKv3XjbTg8IFb4Cfwves=,iv:N0++4MqrDYOTuoyGITzMdeRrm3gg9zXRPa+SNkkLXl8=,tag:1qhu7hq7eSZ1GOw6bxHg4A==,type:str] + lastmodified: "2024-01-14T21:10:13Z" + mac: ENC[AES256_GCM,data:nGxlQanSsr3WamKmM6Gqj/nk3q93B9T4Z7CaG3svhoFBAvOV1HbmyWf8xLig8psCPWvNr320KuWNJ207ruuuRQzUilychq8bXkPmO6DHJ8NRODHLo2EuXArJAY3tkkacNYNfkl0CVF/I1SQ4SC9vh1w0awq52ZqDElonBrdlJvA=,iv:bnOIPL6ErXVDaScOZCr3096deE0tW3IhgxRz6PTqM6k=,tag:9CpkB3cw9BRwWsVWivspXA==,type:str] pgp: - created_at: "2024-01-07T21:18:21Z" enc: |- diff --git a/systems/tewi/nixos.nix b/systems/tewi/nixos.nix index e9ba349b..4fb3755c 100644 --- a/systems/tewi/nixos.nix +++ b/systems/tewi/nixos.nix @@ -44,7 +44,6 @@ in { nixos.sops nixos.tailscale nixos.nginx - nixos.zigbee2mqtt nixos.systemd2mqtt nixos.deluge ./mediatomb.nix diff --git a/systems/tewi/secrets.yaml b/systems/tewi/secrets.yaml index 07105585..31d6d862 100644 --- a/systems/tewi/secrets.yaml +++ b/systems/tewi/secrets.yaml @@ -2,7 +2,6 @@ tailscale-key: ENC[AES256_GCM,data:dGqnKoCFSF6ZmeptOP7bGy4HYDdUCC1oTdXpiUURDgXl/ openiscsi-config: ENC[AES256_GCM,data:xyZVJRzR4vK+UAtq3+/QcszLIlcHXYifHnFKm5tVbFUj3c7PjxYGLkvXZfFvERStewdNIQ==,iv:BcbEupXiLECXwfETaVOqfHQ+vkBbrGxkQn54WBYug54=,tag:e0cddYTQAfzSk2AhvzJFvA==,type:str] openiscsi-env: ENC[AES256_GCM,data:uAlnrtk64UQukKBWHYrH5J4Ys+GIpu5zDg==,iv:7ahUk9nocs4cSgtr/A4G0Xhlp7pZj/bUlUDLMMYEAMk=,tag:rE2mdBGT3kZqyoDIaKUY3w==,type:str] systemd2mqtt-env: ENC[AES256_GCM,data:Zo3+acCcMWgai2ERKbmOlI0hvdkOlNviBqeLb1ALuA==,iv:NxXBDCEevBRqMDY9/3z/Uq2+vENswkYTgTa82wKc32U=,tag:01WUphYRJrwmHv9HE4ac8w==,type:str] -z2m-secret: ENC[AES256_GCM,data:SCxz8nbB/QhfPcAzSEDHMpiQnjv+j0xLtg/20qf5ZEe3P5YRaiKXMSqdw6MX7uQtGh8T44raEgS8PFuGKXY423GV/MNPSzMl16DLBwU5P7TL6lYT97uVYRIqWMKqtPy/1f155743wH8HsJvslmg=,iv:Yw9dvH1dBq+vxHvKm0eeHlqVHRdUuzL71mDTbIF7DDg=,tag:bCiDNSwq7P21TwblvVGq6A==,type:str] deluge-auth: ENC[AES256_GCM,data:qJP/CztnN7RV4Z3pP+jbH1B0zzBm8oa3n3X0pecEVe7UI3+NOSwFaQCBD7Q7JDxzh+qTNdQ/wWi7w0XJDG+aRIikgDG28S9RjdPL/w==,iv:GUEwmuk3JWMgsXsDgDrObW657WcN6wcYAsgXhK4Dvx0=,tag:vZMQ67j5kWBWOa6ZqCaQHw==,type:str] postgresql-init: ENC[AES256_GCM,data:40s9cdfJMcKjfNBNQikpAY6FZ0cgVEGC52fnXwH3jC5d9qI56hIv84ZZhZ3/kVyxSwpQL+pY0DxNjAKMqLpXx/Ujsp4=,iv:Cj7RPBM7tzTb4jBONM8DYWuJ/STRj6vO2ZU2MTkBPCM=,tag:rq7ROGRyjVZulDDof8qKDg==,type:str] sops: @@ -30,8 +29,8 @@ sops: VndVTG0zQWhsUHcwTkFjK2ZPdzRPUUEKJ3flgZ6/s+TjlFgzsANYaOFiEPQuE4zR 7npNUDFLe26Q32G3j/lLSBzZZfKoOC5SOSp9TB8eWMYSxfNnXEIu0g== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-14T19:41:44Z" - mac: ENC[AES256_GCM,data:lyWXXUt2h1Mj3Xfj/7VFkOaip5kZGcolZzxu2yerdwY53iQLDi5jo259+o/1cdqSrnq32Jc5+sakdO3p3A4pYm7mQQIrLSb6Fj2B8fhqnzdTdHY9O7xbSIkdDx6bBZx2gDxFgsOLBRrWa4dQKX5OabC4/+R5SF5WJ+t2tfK+LMA=,iv:y97Zoe6iCKClSb/gB3B4UPBJkUOx3rbhb4/rG84F/o0=,tag:QmtOOQi4Vzl09u5ZgLZcsw==,type:str] + lastmodified: "2024-01-14T21:09:55Z" + mac: ENC[AES256_GCM,data:P8JSR3EqyuzK6PP3/KnIzsEIXXllCDMOfT2Aq+eiXuHE7w32BSdu8WTljOg8vWFH7jtZ1+P5Noi2F31r0CngMtrwxYKob43+HhQtw3VBNYTlZL6n01nK6qbKHncL8PuA4ieJJri+iItSKVc2ZKzXOyjmw+Z1Ij9xfUV872iO3cA=,iv:238Bm7mk9EAa/XR7LP5en9BTaoYKr0AAdMJO01PrYxE=,tag:I7KazGL7ORJZcJffJb9ZBw==,type:str] pgp: - created_at: "2023-03-10T17:06:53Z" enc: |