From db86d754c49894a86195017487341f7b63da680d Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Thu, 23 May 2024 15:46:25 +0200
Subject: [PATCH] feat: add influxdb as storage backend to home assistant

---
 hosts/sire/guests/grafana.nix                 |  40 ++++++++++++--
 hosts/sire/guests/influxdb.nix                |   1 +
 hosts/zackbiene/README.md                     |   7 ---
 hosts/zackbiene/home-assistant.nix            |  49 +++++++++++++++++-
 .../grafana-influxdb-token-home.age           |  10 ++++
 .../grafana-influxdb-token-machines.age       |  11 ++++
 .../sire-grafana/grafana-influxdb-token.age   |  10 ----
 secrets/generated/zackbiene/dhparams.pem.age  | Bin 1210 -> 0 bytes
 .../zackbiene/hass-influxdb-token.age         | Bin 0 -> 490 bytes
 ...f41a2edf0a9b1e3-grafana-influxdb-token.age |   7 ---
 ...08e707f32a-grafana-influxdb-token-home.age |   7 +++
 ...a30b68-grafana-influxdb-token-machines.age | Bin 0 -> 325 bytes
 ...a-influxdb-token-machines-sire-grafana.age |   8 +++
 ...20-grafana-influxdb-token-sire-grafana.age |   8 ---
 ...0ef4b290-hass-influxdb-token-zackbiene.age |   7 +++
 ...afana-influxdb-token-home-sire-grafana.age |   7 +++
 ...07e01835f3d41e6066-hass-influxdb-token.age |   8 +++
 ...0df2e7f04d986d0efb4c11c52-dhparams.pem.age | Bin 996 -> 0 bytes
 18 files changed, 141 insertions(+), 39 deletions(-)
 delete mode 100644 hosts/zackbiene/README.md
 create mode 100644 secrets/generated/sire-grafana/grafana-influxdb-token-home.age
 create mode 100644 secrets/generated/sire-grafana/grafana-influxdb-token-machines.age
 delete mode 100644 secrets/generated/sire-grafana/grafana-influxdb-token.age
 delete mode 100644 secrets/generated/zackbiene/dhparams.pem.age
 create mode 100644 secrets/generated/zackbiene/hass-influxdb-token.age
 delete mode 100644 secrets/rekeyed/sire-grafana/aaf399ee7f5cf427ef41a2edf0a9b1e3-grafana-influxdb-token.age
 create mode 100644 secrets/rekeyed/sire-grafana/b7cdee9d8b438cbb0ee99308e707f32a-grafana-influxdb-token-home.age
 create mode 100644 secrets/rekeyed/sire-grafana/f4f9a0c80af2c983350250c972a30b68-grafana-influxdb-token-machines.age
 create mode 100644 secrets/rekeyed/sire-influxdb/1fb396826d821005062459f27a453004-grafana-influxdb-token-machines-sire-grafana.age
 delete mode 100644 secrets/rekeyed/sire-influxdb/85f8ae2b2465f6ce8f9354f8569d0320-grafana-influxdb-token-sire-grafana.age
 create mode 100644 secrets/rekeyed/sire-influxdb/8af19159b484f7ee716bbd8d0ef4b290-hass-influxdb-token-zackbiene.age
 create mode 100644 secrets/rekeyed/sire-influxdb/b83247c406e7672605e94a6d354ecb29-grafana-influxdb-token-home-sire-grafana.age
 create mode 100644 secrets/rekeyed/zackbiene/31a04c4d82c35307e01835f3d41e6066-hass-influxdb-token.age
 delete mode 100644 secrets/rekeyed/zackbiene/c06371c0df2e7f04d986d0efb4c11c52-dhparams.pem.age

diff --git a/hosts/sire/guests/grafana.nix b/hosts/sire/guests/grafana.nix
index fff12c5..78a68f7 100644
--- a/hosts/sire/guests/grafana.nix
+++ b/hosts/sire/guests/grafana.nix
@@ -29,7 +29,14 @@ in {
     group = "grafana";
   };
 
-  age.secrets.grafana-influxdb-token = {
+  age.secrets.grafana-influxdb-token-machines = {
+    generator.script = "alnum";
+    generator.tags = ["influxdb"];
+    mode = "440";
+    group = "grafana";
+  };
+
+  age.secrets.grafana-influxdb-token-home = {
     generator.script = "alnum";
     generator.tags = ["influxdb"];
     mode = "440";
@@ -45,8 +52,8 @@ in {
 
   nodes.sire-influxdb = {
     # Mirror the original secret on the influx host
-    age.secrets."grafana-influxdb-token-${config.node.name}" = {
-      inherit (config.age.secrets.grafana-influxdb-token) rekeyFile;
+    age.secrets."grafana-influxdb-token-machines-${config.node.name}" = {
+      inherit (config.age.secrets.grafana-influxdb-token-machines) rekeyFile;
       mode = "440";
       group = "influxdb2";
     };
@@ -54,7 +61,19 @@ in {
     services.influxdb2.provision.organizations.machines.auths."grafana machines:telegraf (${config.node.name})" = {
       readBuckets = ["telegraf"];
       writeBuckets = ["telegraf"];
-      tokenFile = nodes.sire-influxdb.config.age.secrets."grafana-influxdb-token-${config.node.name}".path;
+      tokenFile = nodes.sire-influxdb.config.age.secrets."grafana-influxdb-token-machines-${config.node.name}".path;
+    };
+
+    age.secrets."grafana-influxdb-token-home-${config.node.name}" = {
+      inherit (config.age.secrets.grafana-influxdb-token-home) rekeyFile;
+      mode = "440";
+      group = "influxdb2";
+    };
+
+    services.influxdb2.provision.organizations.machines.auths."grafana home:home_assistan (${config.node.name})" = {
+      readBuckets = ["home_assistant"];
+      writeBuckets = ["home_assistant"];
+      tokenFile = nodes.sire-influxdb.config.age.secrets."grafana-influxdb-token-home-${config.node.name}".path;
     };
   };
 
@@ -177,11 +196,22 @@ in {
           access = "proxy";
           url = "https://${sentinelCfg.networking.providedDomains.influxdb}";
           orgId = 1;
-          secureJsonData.token = "$__file{${config.age.secrets.grafana-influxdb-token.path}}";
+          secureJsonData.token = "$__file{${config.age.secrets.grafana-influxdb-token-machines.path}}";
           jsonData.version = "Flux";
           jsonData.organization = "machines";
           jsonData.defaultBucket = "telegraf";
         }
+        {
+          name = "InfluxDB (home_assistant)";
+          type = "influxdb";
+          access = "proxy";
+          url = "https://${sentinelCfg.networking.providedDomains.influxdb}";
+          orgId = 1;
+          secureJsonData.token = "$__file{${config.age.secrets.grafana-influxdb-token-home.path}}";
+          jsonData.version = "Flux";
+          jsonData.organization = "home";
+          jsonData.defaultBucket = "home_assistant";
+        }
         {
           name = "Loki";
           type = "loki";
diff --git a/hosts/sire/guests/influxdb.nix b/hosts/sire/guests/influxdb.nix
index e5465ef..f937e4c 100644
--- a/hosts/sire/guests/influxdb.nix
+++ b/hosts/sire/guests/influxdb.nix
@@ -133,6 +133,7 @@ in {
         tokenFile = config.age.secrets.influxdb-admin-token.path;
       };
       organizations.machines.buckets.telegraf = {};
+      organizations.home.buckets.home_assistant = {};
     };
   };
 
diff --git a/hosts/zackbiene/README.md b/hosts/zackbiene/README.md
deleted file mode 100644
index 021ccb4..0000000
--- a/hosts/zackbiene/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# First Setup
-
-- Install Tow-Boot (version 006 is broken, currently used 005) to SPI flash to be able to use UEFI. <3
-
-- In HomeAssistant, MQTT integration needs to be added
-  manually, and the mqtt connection details must be entered
-  localhost:1883, user=home_assistant, pass=<see corresponding secret file>
diff --git a/hosts/zackbiene/home-assistant.nix b/hosts/zackbiene/home-assistant.nix
index ee5f97e..44ff4e9 100644
--- a/hosts/zackbiene/home-assistant.nix
+++ b/hosts/zackbiene/home-assistant.nix
@@ -1,7 +1,8 @@
 {
-  lib,
   config,
+  lib,
   nodes,
+  pkgs,
   ...
 }: let
   homeDomain = "home.${config.repo.secrets.global.domains.me}";
@@ -77,11 +78,25 @@ in {
       webhook = {};
       zeroconf = {};
 
+      ### Components not from default_config
+
       backup = {};
       config = {};
       frontend = {
         #themes = "!include_dir_merge_named themes";
       };
+
+      influxdb = {
+        api_version = 2;
+        host = nodes.sentinel.config.networking.providedDomains.influxdb;
+        port = "443";
+        max_retries = 10;
+        ssl = true;
+        verify_ssl = true;
+        token = "!secret influxdb_token";
+        organization = "home";
+        bucket = "home_assistant";
+      };
     };
     extraPackages = python3Packages:
       with python3Packages; [
@@ -97,11 +112,41 @@ in {
 
   systemd.services.home-assistant = {
     preStart = lib.mkBefore ''
-      ln -sf ${config.age.secrets."home-assistant-secrets.yaml".path} ${config.services.home-assistant.configDir}/secrets.yaml
+      if [[ -e ${config.services.home-assistant.configDir}/secrets.yaml ]]; then
+        rm ${config.services.home-assistant.configDir}/secrets.yaml
+      fi
+      cat ${config.age.secrets."home-assistant-secrets.yaml".path} > ${config.services.home-assistant.configDir}/secrets.yaml
+
+      # Update influxdb token
+      INFLUXDB_TOKEN="$(cat ${config.age.secrets.hass-influxdb-token.path})" \
+        ${lib.getExe pkgs.yq-go} -i '.influxdb_token = strenv(INFLUXDB_TOKEN)' \
+        ${config.services.home-assistant.configDir}/secrets.yaml
+
       touch -a ${config.services.home-assistant.configDir}/{automations,scenes,scripts,manual}.yaml
     '';
   };
 
+  age.secrets.hass-influxdb-token = {
+    generator.script = "alnum";
+    mode = "440";
+    group = "hass";
+  };
+
+  nodes.sire-influxdb = {
+    # Mirror the original secret on the influx host
+    age.secrets."hass-influxdb-token-${config.node.name}" = {
+      inherit (config.age.secrets.hass-influxdb-token) rekeyFile;
+      mode = "440";
+      group = "influxdb2";
+    };
+
+    services.influxdb2.provision.organizations.machines.auths."home-assistant (${config.node.name})" = {
+      readBuckets = ["home_assistant"];
+      writeBuckets = ["home_assistant"];
+      tokenFile = nodes.sire-influxdb.config.age.secrets."hass-influxdb-token-${config.node.name}".path;
+    };
+  };
+
   nodes.ward-web-proxy = {
     services.nginx = {
       upstreams."home-assistant" = {
diff --git a/secrets/generated/sire-grafana/grafana-influxdb-token-home.age b/secrets/generated/sire-grafana/grafana-influxdb-token-home.age
new file mode 100644
index 0000000..98a8a61
--- /dev/null
+++ b/secrets/generated/sire-grafana/grafana-influxdb-token-home.age
@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> X25519 MiVjKhmcPoryN213jpcDtwM82OG66AVVGHN/AL4H3EA
+y5NItWLZhVKgTrUDDU4euyOeB+9k33Gmguklx38csCY
+-> piv-p256 xqSe8Q A+IEiVKYZQoj1WIZupZdUWZ8m0Qi+7xd7DJIUd1TSXVc
+4MwF1yVTyoRp7QF6/rUpywEVpqS6lg8RZendWAMd5/U
+-> opvcX>!-grease omZ
+2xokmE8MrVzRcsPjTvovMN4+oENCc9I996b6ceiRbqATBHqghFofIyQlC+63BK9R
+zqsVYHsTj9xsHQ
+--- lsktZnNVUrWPii9QSAN8dCqFdqgNXqdPJpEL5NSlQtY
+����o>������h�6��SJٍ���e���7?4��ך�'?S)�i��!Q*�,�S���r$ Y����6����
\ No newline at end of file
diff --git a/secrets/generated/sire-grafana/grafana-influxdb-token-machines.age b/secrets/generated/sire-grafana/grafana-influxdb-token-machines.age
new file mode 100644
index 0000000..b9f686f
--- /dev/null
+++ b/secrets/generated/sire-grafana/grafana-influxdb-token-machines.age
@@ -0,0 +1,11 @@
+age-encryption.org/v1
+-> X25519 8RST3xS+wVkBHfVo21d+fYDxjLyKAvm7YV2pdgTNmmA
+b03ClQlTW2I/qdUsqCse7WhbPhcj0s+g1WUlZ5SIxbA
+-> piv-p256 xqSe8Q A8lbeX/6k6fV+K2/YEiJJXWoXX9OLJ9tDIbO0qJPwRLg
+SjOddGF5dQbDxtmAAWuUmehieP7X5C9jj9CIalDSSxA
+-> -4gr-grease Dg3nr, bBf9!>h
+Kb0310cWQZGEZLpBI969WbCU3OT2hCJ7KzLA2PgDBnagP/x4aZS7MSEof9amXIrb
+jgyIAMySsC2ZjmGPYiNzFSUxZpsBK90NxFCNFpVgupAz6PtXMz4U3QDq3G4Hq37m
+JQ
+--- zYoy9Lc9etflU4gmc6qYzrwaPrvo8q6O6RvkKVb8iw0
+����k�GJ���7F��p��n'¢�Y�g�8��=��}z��Aq���é��B2h3�[�*'�`,A����X���
\ No newline at end of file
diff --git a/secrets/generated/sire-grafana/grafana-influxdb-token.age b/secrets/generated/sire-grafana/grafana-influxdb-token.age
deleted file mode 100644
index cceb552..0000000
--- a/secrets/generated/sire-grafana/grafana-influxdb-token.age
+++ /dev/null
@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> X25519 Bo6kBRQL230lQ3HcTc3AajPp/gw7PA8oTM8gYSg62y8
-o2VKru7J29Nk+pLPIIodPwIRT9dY8iemtPy/PDTaPDU
--> piv-p256 xqSe8Q AldXLqMr0qwEaKHsed9nLXLWyMs1GLAd7fDY+kwelRUW
-p1soq4J7A73ZgoUcQJknAHBo54sFVCaTZ+hirVjL9OE
--> g6z"P-grease (@ Y
-TM39Zea9KUhp85YkmHg7Qd069qelJ3rgHIW4MFHhAvRxGpTnq02uRlkUJC1KdOH3
-kkx0bXhb9ueJ5i0kvQYeURM6j6rIcFy0a4GZgH/QjjF/GDsx0Yj55SPYmfD/
---- ncrTYfKfUkwg2T6xI0dxf5+8qzNWpiUQirMn0G9/w80
-��c�u�ˢ�p�+�M�l���Hx�|��zDj\lz+?I2>`�6lU�LHq���̀���9���m��W����D�I�
�,�U�
\ No newline at end of file
diff --git a/secrets/generated/zackbiene/dhparams.pem.age b/secrets/generated/zackbiene/dhparams.pem.age
deleted file mode 100644
index e49ceb2a626b465e620527c58dbed54de07d60fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1210
zcmV;r1V#H{XJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zV^d23p7HB59=O*Tk4
zb~AZZD>ZINVt7zSRWV3QNO(n3LuoR3R5e9ecUcN=aY<ETZgX@;I5TKgQAciZQgCl@
zO-eOyD@JE=aanRmdPi+)Wm9icNjM5EJ|J*ub}eu+H8vo4aZ_bDQ6NEfNKZCIO=?0p
zGhs(BMOArtWMny3Q86=WHcw7>S7vohF-c}IcXnzsae4}DX)rWdMnp|^Q+ZHKa5rsZ
zM{!koWOp-YM|UwzR#<gzZ8c|ec1}igXhjMwJ|IS9EoX9NVRK~)G%;aMRd7&qP&R0C
zQEE9&Qc7-2Z&^8HW;1j`W^{L2LQQB(F)Kt<K~h0WR&!HzZFW~oSYmN^VMSs$LpF6o
z3Q=%HHDWP%SV3`2Q!+|PGHQ2aQ!!&`ZCGeeZ9+^-P*-JgIAKC(MQU(FLN-TnW=BC$
zS6NXCEiEk|V=Hn~YBXa<crj-(D=}hpHf(4xGEPo&GelG?YB*YMR7^}`b9s3$O<_d}
z!FQIT)4{ZPS;gYa$`TeR1@<ugSSW@^w!e14)j@-Ms(H_<%Gwimq2jGaFn8+#bWlXV
z(sTm6w4jQ#sk&3<X2h3^IGesKjy(veBh0oT10(S^kJ%B9(}n6$#mCxNpck=o^*hzK
z1Xzn|#TPC1SoWUMl<TbOnH(NXb6l2+-Aa}^4rA2YEnh^itk9dQFf4o_v_Qt|E}^xX
zU_p*H!8^kw1`Z!{F(=v?7`-*;Ia*>N2~_j~mA~X^4C>@Kd_P7<48<=t0ra{NS>9;D
zCi&~lS^8{IyRvghVE1^fcjnVjN<&$QOyTVokI50w=SvoJ$z?M`>Sbu>rQAmxC;nOb
zM*-KMuxB?-LIh-&-YoqMcjfW!^Ftgg6G3&&14a8#Gfr|!hm%YmM2#pxElYdfzeWXs
zuWhIMQU#Jicp<Lz)Cfz?R(C7eR`oSSRC5<SA%^K!lEL|?0EB9J%Y?G%)vk6%f(qdt
zZjtQRy@1AJ?0nx#Bh<668MxQ@ngI|v*m%sDTNgl5Q*hZmy|msQInqa~h-70D2ycc-
zc(E<*SAglBKWi6Z)OlddJP*4pB_#l8M|?67$YRI5Y_C`V_LWZMC7h_O$tFj#ef9+G
zn|<IHUW@jX2{B8b#y%sbA;2hTjsWubzomJ0#~~JTnuQU>O5ZF<>UnZAMDQ-}%i_}P
zk}Mg``l<?JsizV!$a;5^R4U&LFo0w9)9S&b_rv7<n!?UcG#}Lx+tQ60Su70sn*$MU
zTxV#zj$~TCke!G|1pJncic-O6gATs;AM|^|lHPZP>#^l&?Z-EdDu<dxp$i2~(p-8<
zBt6~U21w&wKLwa6BowUH8Q_cx_vVl#k65un7m~btu;#hvr2VvqnxJJND#jI{Nm-t2
z6>CU)|HFyoj(Lr}P?^Tmw$f!GO^>H>N^A9-gT5UG`<gp4^ptW>8|j<Ywr&K#RA7P<
z;)SloAJZ7)0t&ljuHLZ;C*c8{oiRkFx?*TZ))$Hp3PUb4zuZ^~K<$LS-n&=Fs7{_K
Y^a(Uv0Sm!N<c*!m?QmB)TVZQZO-v#WhX4Qo

diff --git a/secrets/generated/zackbiene/hass-influxdb-token.age b/secrets/generated/zackbiene/hass-influxdb-token.age
new file mode 100644
index 0000000000000000000000000000000000000000..59a090b812bda3fc4a6637f65c339e9ddfe35a33
GIT binary patch
literal 490
zcmWm9J&%)M003Ye%r!U|7Z(Q`Z#hG_0xgsdXVOxd9#`7FwB>71fxhLdz}rHBlDKJd
zlY=G~cO5lxaWGzPG`AS18{G6pO&p!|e!-K+bRYpEd%Z=e7f1W?+Nos}Mm(%)G{aD>
z>JUu*x=SlY$p;N(Ri_=+(n4|&id+g&sxlnP=Y0)`+Z<DSP@L+F1y)f%3k?zPc6vvw
zw`lMam+6{#TL>t)R4l<gyb_R?5r}5kYO$I?4piIQS>{_a$>RZCDx?=qWi-HPYm0mC
ziZn8)@(JF~xK6VOF*ok2469~Rtqi=HlQ;7unLFu{qI!7bj3<7R^$cs=GjZq2G6`o5
z%>-g>*H{;enLQlU>qnejuzVN;D3es!K?~j*0d>GJeIU+83~YG~Ehs<=aId|TmcS5j
z8yk0=#Era7EQ||Y(cLbRb$>CDYRR1QgHBXO1rj0+iuPvCi)GnNV`V=4A0~*ZUZz7e
z*2_(?ayBxVF$+JJT`7#30+3`7(+DM`*4hekg6Yy1t$q44->s1MgUZR?(^ubaefn^D
z^5po&wYQfSk9O?a!ZWjS^YHxR*Ux*uFCM=;c=0BGo&E`0XAjEn*H7>LeSdc6$6dX3
L{QP|P*Gu^y?MSPR

literal 0
HcmV?d00001

diff --git a/secrets/rekeyed/sire-grafana/aaf399ee7f5cf427ef41a2edf0a9b1e3-grafana-influxdb-token.age b/secrets/rekeyed/sire-grafana/aaf399ee7f5cf427ef41a2edf0a9b1e3-grafana-influxdb-token.age
deleted file mode 100644
index 613f0f6..0000000
--- a/secrets/rekeyed/sire-grafana/aaf399ee7f5cf427ef41a2edf0a9b1e3-grafana-influxdb-token.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 B7KO8w 8wCp1rYZS3lDaGRqUiTIUBpfcSA8vH1CddfRpcCmwFg
-F5t+bPiacZls0kXXmYlGditf0s1RiMcXSLl0nsSW+jI
--> C-,-grease <fcN F g
-GTedNm74HhMm
---- Y13a+/YSQ9MMjhRpfwVHQ0nphPG8qN4798HEgRVlovU
-m��]�V��^��"�R��$������������J���R�e�iuH9pf��SFFa�ҘX{��Q���&��+�օ�K�
\ No newline at end of file
diff --git a/secrets/rekeyed/sire-grafana/b7cdee9d8b438cbb0ee99308e707f32a-grafana-influxdb-token-home.age b/secrets/rekeyed/sire-grafana/b7cdee9d8b438cbb0ee99308e707f32a-grafana-influxdb-token-home.age
new file mode 100644
index 0000000..c737d8c
--- /dev/null
+++ b/secrets/rekeyed/sire-grafana/b7cdee9d8b438cbb0ee99308e707f32a-grafana-influxdb-token-home.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 B7KO8w NtS2dqQU1BoTwoT/42UfEcOKVlrKDdT4zoSqtkvD2Cg
+E3gjjbUQwUAs/Gljfv0CfoPAKo6L9rcPBPP6rx9kBTI
+-> EXb+5IAV-grease e) G
+kvWs+CDtZg
+--- 97OhIK+gTO3VZe+lOmjFGe1RygiTPhbyK5ZhtIWW4tk
+�W��|N�J�����zX��>���f3i��F����Z�36MnJ���B7��MMc߾W9e
�Z�>D��n}�r>&
\ No newline at end of file
diff --git a/secrets/rekeyed/sire-grafana/f4f9a0c80af2c983350250c972a30b68-grafana-influxdb-token-machines.age b/secrets/rekeyed/sire-grafana/f4f9a0c80af2c983350250c972a30b68-grafana-influxdb-token-machines.age
new file mode 100644
index 0000000000000000000000000000000000000000..673362a5c3270c9c03d709d1db6a449adbf462d7
GIT binary patch
literal 325
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCT4GWYhkC|7VcHYhjt
zPxh=b(2g|EDK|)VOVKYiEzYV6_H@dyj4aj;DsgwO2rNs_G2w~`O3n-}c6Bo{FDx~7
zvJ5FTiwsH(_0I}OG|Mw{^h>WO5AgTNDKhgaDhJu7rJG)qnpm8wpluzcpk<>~p<u0I
z8LrEfXk4BW9u!s>?o{cN>z?Url;)G=6l7Uo=2%?rZX6!rZjj{8rK_u}U>Q`9W#XHk
z=Wb?{6X~6sR+8eASl|?uqg`Yg=3biZ=5FcaSeTd(6v*e|c>8HNTVUq3D~q;CEp&DH
zAn(v`_MzTHUQ4YpYf{<&<}{(`*vCgogijt_?>qnX$(b!1+kIadX)q=@Ctt3fd~vN2
VXT)@)b2A--pZdv&?Pl1i2LLD)a!CLH

literal 0
HcmV?d00001

diff --git a/secrets/rekeyed/sire-influxdb/1fb396826d821005062459f27a453004-grafana-influxdb-token-machines-sire-grafana.age b/secrets/rekeyed/sire-influxdb/1fb396826d821005062459f27a453004-grafana-influxdb-token-machines-sire-grafana.age
new file mode 100644
index 0000000..694b7c2
--- /dev/null
+++ b/secrets/rekeyed/sire-influxdb/1fb396826d821005062459f27a453004-grafana-influxdb-token-machines-sire-grafana.age
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 1tdZKQ 7/FNR9qPfnog6Ci/YIfPv/SWstIvi9KNfoOJSKj3UhU
+pRyszE6vS1KWz/oqRddga6TDCKigzEHneOMtpiF+6ZM
+-> V]6Awl-grease
+vGI9Lof1yQ
+--- ugvostW30lRVwoa0y1CG2zlNnOsG6+Fl6xA3VZJAagA
+MRZ��c�?,���M������8��R
+ӟ���v��܄J�И��h���u�oҀ��M����뻕�\({Ӟu
\ No newline at end of file
diff --git a/secrets/rekeyed/sire-influxdb/85f8ae2b2465f6ce8f9354f8569d0320-grafana-influxdb-token-sire-grafana.age b/secrets/rekeyed/sire-influxdb/85f8ae2b2465f6ce8f9354f8569d0320-grafana-influxdb-token-sire-grafana.age
deleted file mode 100644
index 0b98ad8..0000000
--- a/secrets/rekeyed/sire-influxdb/85f8ae2b2465f6ce8f9354f8569d0320-grafana-influxdb-token-sire-grafana.age
+++ /dev/null
@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 1tdZKQ zBATrC0W9c0OA8FO03FFxqPJaLsNb7O5ownBSmSn1gY
-X3oqnPWt8wv3PaHtdxZ9SRsz3fUtowpMA6LUz3Vvjxg
--> ;}-grease O>
-ba89giA262+t2OeOhZ5ewG+AUHXjJnT9UkpPqQaZovpmWaV4lRLX/+e5DWVzXlzd
-n5fEjrhovARYQ9rTCIwI
---- LX956zk61RQNVOkrkxHRN4Ki6auA6crNbwl4SmysfO8
-��2�%y�Ȼ�ZOe����R�6��L��~0u��(�i��"xi�+�f���]�5�fx��P��Wɫ��M�V=�9n ���
\ No newline at end of file
diff --git a/secrets/rekeyed/sire-influxdb/8af19159b484f7ee716bbd8d0ef4b290-hass-influxdb-token-zackbiene.age b/secrets/rekeyed/sire-influxdb/8af19159b484f7ee716bbd8d0ef4b290-hass-influxdb-token-zackbiene.age
new file mode 100644
index 0000000..026d444
--- /dev/null
+++ b/secrets/rekeyed/sire-influxdb/8af19159b484f7ee716bbd8d0ef4b290-hass-influxdb-token-zackbiene.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 1tdZKQ 7hRaB/jl5aAQ0OaLaE84invNGJc4iuzxk/jGA7cxMS0
+nKH9M7KqbC2yQbjRY7h9yeCUPjii/PKbaArv7vF0tgs
+-> =Bq38rC-grease |< t'@ f
+WX5ZG96lJs4zzi4
+--- Msg4tXQbL4PdKR//oobUKg2lvMAp1IZgimw09W6BnK4
+�	�h�}�@�h�4[������=R�J`O3���ul�bΒ�쌣⦫z�UB�ⵢ��ĸ/]�i�-��볪��N�
\ No newline at end of file
diff --git a/secrets/rekeyed/sire-influxdb/b83247c406e7672605e94a6d354ecb29-grafana-influxdb-token-home-sire-grafana.age b/secrets/rekeyed/sire-influxdb/b83247c406e7672605e94a6d354ecb29-grafana-influxdb-token-home-sire-grafana.age
new file mode 100644
index 0000000..6e50193
--- /dev/null
+++ b/secrets/rekeyed/sire-influxdb/b83247c406e7672605e94a6d354ecb29-grafana-influxdb-token-home-sire-grafana.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 1tdZKQ AsgXjTnMlWoukmKdk3jBqZKildhbuhemjeXVEP6hxU4
+27r8siEl0mvMKMUxXapJqYgHkc/3pO3pGQwzKFV9lV8
+-> IzSa}-grease )hD+%g6Z
+jdkBplRj8opuM6K2D4j2g4CeyQ
+--- 9/pgTJnwXS0d4avPkE4joBUEiCxGOzzAM2+O4kAayxg
+: �QqA��x�}�h�W!�k�FKoC��<e�s���S�ˊ׈�(����p��2y`nMZ<�9E�@���v���E'�S
\ No newline at end of file
diff --git a/secrets/rekeyed/zackbiene/31a04c4d82c35307e01835f3d41e6066-hass-influxdb-token.age b/secrets/rekeyed/zackbiene/31a04c4d82c35307e01835f3d41e6066-hass-influxdb-token.age
new file mode 100644
index 0000000..a802a62
--- /dev/null
+++ b/secrets/rekeyed/zackbiene/31a04c4d82c35307e01835f3d41e6066-hass-influxdb-token.age
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 DynNMA t66pK0Xp15NUNuTlvpUDfD+jfYmZr6vje8Zil3yV4xA
+NJ89Tcht+GvI7R8RgA0GniOLgbIS7IBTTal2FUN+Pn8
+-> L8|W-grease {#S
+6NoW21RijvL4DTAL7742L9eB5aG3X0fgvf+3vY6IGLW2vKPCIVr1rLkzzhfYnUp4
+avIHxxFbWVHqXUHO71WMcBiC+dHLYxJ9gEeY338
+--- 3zxIzft5E8Z9sQIrEMZKkqxugeS9g8LWYeY3hP8HHio
+.�u��.BzLHNrp����?�#�s���|�c�xۡ\��$����Q�]���.����>�
@q�)�j����"
\ No newline at end of file
diff --git a/secrets/rekeyed/zackbiene/c06371c0df2e7f04d986d0efb4c11c52-dhparams.pem.age b/secrets/rekeyed/zackbiene/c06371c0df2e7f04d986d0efb4c11c52-dhparams.pem.age
deleted file mode 100644
index 43589d0ec2bff51e237f2cbcbde85bba76446cc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 996
zcmV<A0~`EdXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$b8~1dWn?lnH8D9LM0svbO+g?^
zQ$kg9Y<EL5WlCaAcWy#tbarWNa7#=zLP;+$SV}=tNKa2lMod~qSU3uJQ!i3;b8kyY
zcuQn%R5@!kS5I?yXKyQPc4}>RVoXtbWol?tQEX#Sc~uH6J|I0UXL4m>b7cy2X9_JX
zEg)Akc~n(VHfKpmO;0N|Ohs60V_|kqWl&XEMpj36YDZIUFE&$dG%IdSX9{m#>7N*~
zJ|KbmmNUgb&y(dTjut?gu~1sV9hW!1LxD_3r`AEqt?MR`y{gIMFU4^4+^r6pD#&^A
ziBrcS@5_b>@O?wz=LFE381c{+!!c5e+%jc_mo{uQhX5VduvMo6`Gv`~^K-f@axQQx
zy20Br%>}PTx%dkGnw3VmLfm=4q5O75)@s0NU4V$iQz-djk!bxC85b@6wl-b;VA;DE
zQ|QlzZ1f%s|9qcol`Q5(?P)M$t;X7vaWx?Np_$l~u3ADjc}pMiI?_(VhNXmC=YWE(
z3gB!~Ju5p(27g{I(QKIgeR_YJM<o~POcnrE(ndx|<SCVpU?r?TC@OxZ_lkDbCvgol
zLqq#6-$ksAp^?=Ni}=?>;y-0D+jyLb506q0>RV7>005wafa!Y}lPW`xwTGUAACRY0
z?dvj1fdc0^DuR9XQo@Ae^N^r27k=$XPl!5id(UYNWCZBKvy+U$$EpF$Jx+TZipls6
z?bdsJdM^+hoy?GN{|V|~bbQwx>~_-d&{Q(aTc0{rjazmXCfz@mAREhlZHxrDxs}Et
znn<msD#6HPK;o0e^#_?cbEjM4y<K`?u5CKwc19+j4*4Bk8L;We7Ix&{Te(#%tJN#n
zxZD;=S7N*hM>-nrV5E}&W?tqbPWn&L$}==cfjAEqqT#RGqm#T|Bi|UA$iXDWsG8p(
zFMDCKp3&>=b%@p71Cc?ge4}mQ<w-S9%JE|P)xO8WFNA(rP|5q9YlP}R#!wFHU0jIF
z8b>`J>{PL$c(*q7-`1pAB};+vZ6#DH`tv<!w|!!Zey&2?puP-OiaeXX`A3)8e?D}v
zSaPe)De37pX?B>9-<}Pc9O%43l}@mh9(7~JK04Nr2NMt!_}C(?E9kz81=X74O2$w?
zw0Ap64#M5Y*Efz$mvRlkrN0?So8^b$#J>YazvM^;U6owu5yhv@bm_GPp(xLvcK38@
zeV_a2(+0KsO+E88@c_|VjB#cv_VBkSNr1dcq2^F3M_q;>?veRC03OK+DSu(Ek~OLa
S^86-9J*s|c$i)J1Qafp_4b(IM