From 4e438299346668ce08298c7cab4a28f8778462c2 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Sat, 7 Sep 2024 15:19:51 -0700
Subject: [PATCH] fix(logistics): more reliable connection

---
 nixos/access/kitchencam.nix    | 16 ++++++++++++----
 systems/logistics/secrets.yaml |  8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/nixos/access/kitchencam.nix b/nixos/access/kitchencam.nix
index 00af3023..b413e9e0 100644
--- a/nixos/access/kitchencam.nix
+++ b/nixos/access/kitchencam.nix
@@ -21,12 +21,18 @@ in {
           name = "motion";
           id = "kitchen";
         };
+        settings.max_fails = 5;
       };
-      "${upstreamNameKitchen}'stream".servers.service = {
+      "${upstreamNameKitchen}'stream".servers.service = let
+        motionServer = nginx.upstreams'.${upstreamNameKitchen}.servers.service;
+      in {
         accessService = {
-          inherit (nginx.upstreams'.${upstreamNameKitchen}.servers.service.accessService) name id;
+          inherit (motionServer.accessService) name id;
           port = "stream";
         };
+        settings = {
+          inherit (motionServer.settings) max_fails;
+        };
       };
       ${upstreamNamePrinter}.servers.service = {
         accessService = {
@@ -34,9 +40,11 @@ in {
           id = "printercam";
         };
       };
-      "${upstreamNamePrinter}'stream".servers.service = {
+      "${upstreamNamePrinter}'stream".servers.service = let
+        motionServer = nginx.upstreams'.${upstreamNamePrinter}.servers.service;
+      in {
         accessService = {
-          inherit (nginx.upstreams'.${upstreamNamePrinter}.servers.service.accessService) name id;
+          inherit (motionServer.accessService) name id;
           port = "stream";
         };
       };
diff --git a/systems/logistics/secrets.yaml b/systems/logistics/secrets.yaml
index bc1f50e7..1033f9bd 100644
--- a/systems/logistics/secrets.yaml
+++ b/systems/logistics/secrets.yaml
@@ -1,5 +1,5 @@
 logistics-user-password: ENC[AES256_GCM,data:9J0b1b5Kq1FEgzSe13DonlPE9pagJR/wR+2A9WYp7Dcpx8B3pX6WwaymncWs1BGlwYyamIzS9N39NJAxymnGaLEi5SN3d8fRrQ==,iv:aRroIPp6Kgg9F4yH337NGTr5S1IUmPqyIu8OXDAV1yQ=,tag:boKCGNUZ9OzpZraSIshmvQ==,type:str]
-networkmanager-wifi-connection: ENC[AES256_GCM,data:nxdDGCePACS4WlDQNPrmjYvs7kxDHCoVnrQmj+VweaqeMBr3An9MI8r3oyJJRCI2G8HA9agzecB7JcKzM7CWnxDo5ijHJRezSRwjwxgWgkCHNcOoB2MhEpH6KP8dRqd7DYnI2WgKVzI77hqM0mkiWdE+LPWCeA810wtwRD21CRc9WhZtwZrjNy3NxmyzoHBmp8xbkxQSeSokfXNpFERbTY4x+j2pBo7Mjj5eQl425LnF1XRqox+raXiowTqwUILyFBWaQ0WIfQPI/oS8SGLVu3Rjjbh3WV2NJyag46afX85SD+U7ihyZ4OYBv2Uxk9eEsoycmA2yg/Fnl+LcmiyMJiXxUVR6iyeVFhKXt4FC/Y23PNn+0ezsMZEco5tqHWyaT1tnBmOCnTYI6nWsZvfDa/7HvMOtWEHfsyqA61coCpJMJIt+EaJA6AyKQmjT+ftVdoh4sU61FVaTqMU=,iv:ySfCpobbT9vIHzEeHXOw/S3sv7Bij2olh5mmiHEDYK8=,tag:tVFv/jJDcpxZmPt7HtlSMA==,type:str]
+networkmanager-wifi-connection: ENC[AES256_GCM,data:z99WZ+20VrKHVCvPYfzDCj8x6Qzp2aIJLTfdnPYkrtM4dy64HRcfiZ7NyuNWCo5jgO7S5ndsIS1VEzvHQlrhfJZvJV6KBTJqaKBgbd/qtc2KQPXdZj9q6bjJHH0aNVJr58JLKDsS2NNaufgybfoEwfFZ7/03RnAc8y9ywteZHmod3e5Nbq+1FcCw4opggRVkIZRnrE86a/X3Dw2vyqF9xMXzUH/H64xn4RJpJZtalSFDtNu1JF9KL9e7UCWd3QwBVbID1QQUJA4g4Q32DWy/SHoTswOJb8DAawNscYDnp4yQ2ZhdBLMTDA25PAUan9jPWZXT2n3/ouMjVe1qQXagHScQvc4cTNYLqIoeP5GNJxSXQe44TnGgAoMWxw4jXVkYg5ciLBtno1CNb1lL/BTtkr86PN28+eXvJPrS6IEuhP4hqFyLkgq/6onElxn5bg9fAAGS+jXsrEWKeQYglhT5h2CGLpN911v/uR9ovKIG0HO+qaP0iXONtiIYaEeWoOG4qZMReWozhaiyzfzvIg==,iv:sY2ZOykzTlpvkerJynOiOg3VQ8VtxLR0Uz0VoAezLlg=,tag:2yjTFDZMjVjWJcZLRyz1eQ==,type:str]
 sops:
     shamir_threshold: 1
     kms: []
@@ -16,8 +16,8 @@ sops:
             dFVET2hqU0NTTmtKc0dKSGFSdnhMTGcKreJqNeHczADUmMgHOHhy+pa7S5hZvTUt
             TXycS6WHfBjiG221yoxyr/L/wPCHKTatVMmcxHhTPBKyzOBYZL3dzQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-16T19:01:34Z"
-    mac: ENC[AES256_GCM,data:apvggth78CPHKFesY1OEkDvHKDFpL2RGmrce//FH0hzk49+h3vW7vtRwMaEKoyVYFpzkdXKUzYWfU9Dw4i7McU1lue9W4ELSmuBiNhflZdy+2cCckAwhvX+bvXM6OaY0fcwVTUWSffrzmK63fLWP0obv6CK6i59y1slYGHT+g2U=,iv:59tE0CmDrPEsiAlUb6v9O0sSBKWDXFO/ZzNukEHxdrU=,tag:dbbYIf2/cLOTIU5sMaVPtA==,type:str]
+    lastmodified: "2024-09-07T22:10:11Z"
+    mac: ENC[AES256_GCM,data:evHG6UFDvTJz5SNDM/eY/pI/RW2CaPgsjxu1Iw5AHwaJxuO76PCE4X3b3ds5fvVLLWO9sb4kE+SLnCI9ENhcphUsz207fX6kMeaXgLiMxHNPGydzrr3Mn28pUqpsyEW62aDqkUsBUcS5Q5JC7pu2w3fkyriVVTUYQ9F8PRWPPVE=,iv:Nn/jCozUIgQesCoTl4uR3Sf11V8imU4AYGQHFKfLRmg=,tag:uX+0Xdhfs+OaH5sqA5ltoQ==,type:str]
     pgp:
         - created_at: "2024-05-18T00:09:19Z"
           enc: |-
@@ -55,4 +55,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: 65BD3044771CB6FB
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0