From edeaca4ef32dbe8a347c309f4eaea369c3d3388e Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sat, 10 Aug 2024 12:30:52 +0200
Subject: [PATCH] weewx-proxy: move mqtt

---
 .../hosts/argon/weewx-proxy/environment.age   | Bin 754 -> 755 bytes
 agenix/hosts/neon/config.nix                  |  22 +++++++++---------
 system/nixos/weewx-proxy.nix                  |   2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/agenix/hosts/argon/weewx-proxy/environment.age b/agenix/hosts/argon/weewx-proxy/environment.age
index 130e2b63b1ff96652b43c71fb64bd8d44f0362aa..71ea8711e1cfaf88710174d42dcb3cda412a3ddf 100644
GIT binary patch
delta 723
zcmV;^0xbRV1@i@vEPqKyLqSI|aZ6=ERzZ1Wb#p6cc6Cc@FhNUgd2Vf2ay4c(W_U#_
zNJVE-Q3`r=GHY>kPFZR+FLF&*FF`Xfb8T!hD=<-RczQWiSY~upFE&X~HgjokRSGRW
zAaiqQEoEdfH8n9gATefROjS`JHZnnaW?^tKSZzjZZ#hGFaDP-eK~YjSRa#_oa!hJO
zQ&UfEd3a@WRZ4m|3UPEyW<q3iZ!|DSL~K}XRaaqmbwyG`XfaJ^QAs&$SZ_;NW@cGp
zOJZs`3N0-yAaiU&IZbk7Q%G%YIY&86a%wL$b#YpEVn|VRVrEKtMQ2KMHFPp#R(3O0
z3g&`tr>}8mn16(Wd;llACC?9ry2bW$<HV45fvx<%hdN$^Ylm&sHlk+PL%E@dTv*FD
z={ic6iHU0g31+XK=J<zA!&QG=5V!qY?%<`nZd=Luvn>CPeUcJoq%Bh}M&i68Lvk}I
z4vz+zU*BWU{A&oY(Q-5ZIf2*E&>fWx$+IU9$&9I$Fn>&dIv0mYtiE-omS2!5zj7|^
z@%#9{o1w=>_ft#~wPk#P<nKoNPm;-ntG_ikaF+j>jQZn;dsrKQpcJ~k!H{xcZro3=
zpAYNn4zRR~8aCu&ECsaQw{WgTD~Pw-MZAEGHQ%TR#b{0{=?<g^e1dzazAuQXsTH8&
zEgQ03dVjkRjrLe3|IP0}VQMg4$hm)sco;AI8lfLHWVW8^9rXz_9+|-K)4H{(3u6wp
zR!Rad>ZtkG_F&Ag>+cB8MwxyyvIgDPFuqEONA2zB(A-jYZ+Uj7mV9wF9nLVE$xEO1
z0uTmHh0A**IF$iP5K<m^_(IW|l*Bc{@FxB`mrM<Z7fUY@P+-=306?}|@;)&H4)2?e
zoLomVoSniSTCi(b0W>r8X@F;pouc)#L+3p<vi!AJI7o{5kmvn$sX~v#5Y5C|Rr!Tl
F!ri+YLBaq4

delta 722
zcmV;@0xkXX1@Z-uEPpaKQ&}=^R8DV4LsdvkdSys3bZd5TYG^lBXmWOHVKsSBOI1fj
zW^hU|X9{OXVQ4W-ICVEuZfQAoa&TBhbVg%LaB+H5QAt90XKqqKQ87j}Z((S3Zwf6w
zAaiqQEoEdfH8n9gATefROjS`JF?3loXmCb%OHDUMXe(1?Pk&}JFGy!Nb5lcNL{xe-
zZZ=nWcXVf3XE-o#3Q2EPOjc-bX=_1LN@hb;NNjORSV&GeSub)>dPr3{S#MG>Z)a*x
zbyr$d3N0-yAaX%xLP%mnaB*2#FDq;}P)ba4Oj2}uadR?qVQ4W-Xjw^7FltaTZbvm|
z3bJ&kFo>>VAb%3dvW4wIr*dEl-HFd`^t>`mWw$_fjHRW-?R9k#Wz`|9fThq^9A_43
zNlCYKbu!KJKfhY;YK{T2-tN-q{Jp{aOeBd}>KcENc6Z4v2VX)_#jFZcF>{2udGi|1
zg*#HEci!9jWwg8$^70ScB<vaVE*;N4NE&pn^+`OQjDO3Q(}Zv!nJs-^t}nhhTCR&9
z%az?n$mXD;6y_twZ^&as1>(_oB57E)y+ddmrU*O&Z1x6J4%X7%DTtTcA$@j?a?sr`
zn?^SV;?c4w@uwp4UWncrf05@nP_3s8n%(Ji_!-Sa+BkMsf%OG#lSjI90goaXflp*P
zf=g(AAAh&h^rU|Q%_B@lACUAdk&Fqo)cAS|HD7s`Lqy${7iv%7rA=6^gd&)0{x|PK
z+n%L-vEsv)MgfSOUgKGD?lnWj8QS8t<XGjNT$}D@Z(e&q7k6oXtmHepzv*cbRTrmk
z$Og}BR%zg;irxW{BW1CMDOQd3=&Ej8rp$egq)XxfGqq3Kh?rC!=krnH&hDrOf8boS
z%k^B0N&mFVii<in>;IQ|53cv;AsY|SGcKJ2cu0WGH1sp`fSPgdyfp28+b-%Ta)$b2
E!gVP_WdHyG

diff --git a/agenix/hosts/neon/config.nix b/agenix/hosts/neon/config.nix
index ef15201..032889b 100644
--- a/agenix/hosts/neon/config.nix
+++ b/agenix/hosts/neon/config.nix
@@ -17,17 +17,17 @@
       file = ./forgejo-actions/token.age;
     };
 
-    mosquitto-password-weewx-proxy = {
-      file = ./mosquitto/passwordWeewxProxy.age;
-      owner = "mosquitto";
-      group = "mosquitto";
-    };
-
-    mosquitto-password-home-assistant = {
-      file = ./mosquitto/passwordHomeAssistant.age;
-      owner = "mosquitto";
-      group = "mosquitto";
-    };
+    # mosquitto-password-weewx-proxy = {
+    #   file = ./mosquitto/passwordWeewxProxy.age;
+    #   owner = "mosquitto";
+    #   group = "mosquitto";
+    # };
+    #
+    # mosquitto-password-home-assistant = {
+    #   file = ./mosquitto/passwordHomeAssistant.age;
+    #   owner = "mosquitto";
+    #   group = "mosquitto";
+    # };
 
     deye-mqtt-config = {
       file = ./deye-mqtt/config.age;
diff --git a/system/nixos/weewx-proxy.nix b/system/nixos/weewx-proxy.nix
index bf15513..8e60b8a 100644
--- a/system/nixos/weewx-proxy.nix
+++ b/system/nixos/weewx-proxy.nix
@@ -44,7 +44,7 @@
 
         weewx-proxy = {
           hashedPasswordFile = config.age.secrets.mosquitto-password-weewx-proxy.path;
-          acl = [ "read rtl433" "read deye/#" "read bitshake/#" ];
+          acl = [ "read rtl433" "read deye/#" "read bitshake/#" "write hadata/#" ];
         };
 
         home-assistant = {