From cc1b9f47949b8d0dc8a8bcb8f2280a3964eeeebc Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 12 Jun 2022 20:17:08 +0200
Subject: [PATCH] hosts: move matrix to hades

---
 hosts/hades/default.nix                         |   5 +++++
 hosts/hades/secrets.nix                         |   4 ++++
 hosts/poseidon/default.nix                      |   5 -----
 hosts/poseidon/secrets.nix                      |   4 ----
 .../secrets/matrix-synapse/secret-config.age    | Bin 699 -> 717 bytes
 modules/secrets/secrets.nix                     |   2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix
index 4fd34ee..f08fe5e 100644
--- a/hosts/hades/default.nix
+++ b/hosts/hades/default.nix
@@ -57,6 +57,11 @@ in {
   my.services = {
     fail2ban.enable = true;
 
+    matrix = {
+      enable = true;
+      secretConfigFile = config.age.secrets."matrix-synapse/secret-config".path;
+    };
+
     miniflux = {
       enable = true;
       adminCredentialsFile = config.age.secrets."miniflux/admin-credentials".path;
diff --git a/hosts/hades/secrets.nix b/hosts/hades/secrets.nix
index 656fb2e..9e07681 100644
--- a/hosts/hades/secrets.nix
+++ b/hosts/hades/secrets.nix
@@ -15,6 +15,10 @@
       lib.mapAttrs toSecret {
         "gandi/api-key" = {};
 
+        "matrix-synapse/secret-config" = {
+          owner = "matrix-synapse";
+        };
+
         "miniflux/admin-credentials" = {};
 
         "restic-backup/hades-credentials" = {};
diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix
index b05967f..0695469 100644
--- a/hosts/poseidon/default.nix
+++ b/hosts/poseidon/default.nix
@@ -96,11 +96,6 @@ in {
       port = 8083;
     };
 
-    matrix = {
-      enable = true;
-      secretConfigFile = config.age.secrets."matrix-synapse/secret-config".path;
-    };
-
     monitoring = {
       enable = true;
       domain = "monitoring.${config.networking.domain}";
diff --git a/hosts/poseidon/secrets.nix b/hosts/poseidon/secrets.nix
index 719d569..de918e3 100644
--- a/hosts/poseidon/secrets.nix
+++ b/hosts/poseidon/secrets.nix
@@ -17,10 +17,6 @@
 
         "lohr/shared-secret" = {};
 
-        "matrix-synapse/secret-config" = {
-          owner = "matrix-synapse";
-        };
-
         "nextcloud/admin-pass" = {
           owner = "nextcloud";
         };
diff --git a/modules/secrets/matrix-synapse/secret-config.age b/modules/secrets/matrix-synapse/secret-config.age
index 8ec58e864c8e26d1843c179c3f19c542f53e6cdc..eb23b3bda2f2742f24f2779e51020ed4045283d9 100644
GIT binary patch
delta 685
zcmV;e0#g0E1<eJJEPqotOhs*LR&QukHDyjoL3(peZdPw%bvR-xYh*BMX;4;GPgF}c
zH+DlsK?*lFN@z(%L`G#-a!puBFIHl0YDqRRS4C4fb4yu5Z$x5EazjORb1!URcM2^&
zAaiqQEoEdfH8n9gAaGbXc`|1pSvF`>G<Z*NICxWdQ7=hQFMn=1acodFQEx?1S~PEL
zD@JlNW@K(tGFe4I3Ql@3R(3^hc5QTSdQw(bPFGV^MKViRL^w!VZD=%eY;ZA9D?xHf
zRB~`M3N1b$QBQ6&SS@FAWnpt=AW?c$I$C}pWgs#jK}ZTvQDR~?X){qPYE(mLNl|bs
zT6r>KQ$#CNYkyK~Q!!~bQ8{o%Rdjf2WNJl0FgQmzc~o&mbys9>bu?#GdRj173S?1b
zOJQ|RD|Kgec6Lg5GBIdMQ&MwGFGz26N_j+AGjmr<H)mx}H3}^)Eg)ntb}L~qId4QO
zH8??YG%sm3Vofq)LPbtTax++1G(}i#bYo6OG+0tpQGW^y0>L>EV-XMFbc<B)JFn1R
z^lE3)W%|qdN1oVgeAaVid-EN>hKgmom=2@L{8OU}Eh$}ob0hijql}b-)0`<Y>s#7h
za#ixNTbi-0R3wfHcRKt0qE74l$x(ggMaG>mf+lvKMz=IiPs9kz&8yP4mJIC=MYsl>
zmKFv?lz-u0HXN=}r~kmD!@x-TEOptq#ONB@s5ffFImY2JP=h|?8-097m5jmCGwJ)_
zjG)GnPEID``K~6Jyi|{I1RC9s&|TLG0HpVWX6WG9Hg4`tuP-FnlzZWOt~`{k%tN62
z?__Lo94|KHRS#05XncITw{Zd;$($lz#o<dn-6k-CFzOg%xvo!p%8qy-eKcFA0rIAc
T(*4OTJTrLn`}`=WJw&bxAgB~o

delta 667
zcmV;M0%ZNo1-k{1EPqIOMoC&)Xe(G{Qbu}XF*sLDV^T;tIdo1#N_TN?GErw^NN{F)
zHdbsyO$s<Lb~i6{Q&U)PGiPf!IXF30FlJ|FdU|SkX<<`OVR|n{OlWv^Xi+m|NeV4K
zAaiqQEoEdfH8n9gAbK`MbvRKVXK8k2LUMUXZE|d7Ffu|-Sbs2ZGfsAOP*_DtdO~S#
zVsLm*Z!0TnPBT(#3PxpNFLYT-QEy{)S7&ocQ&?j+X?908a6v?KL^dlgGDvnuVQE)m
zMl@773N1b$OD#DqXL4m>b7df0AyQQ!Usip1Tp&d`Pau6oZZ1?yQdSC7cVv1~M{rhj
zVpcaqMK)$RIDc|RVP`{dXHaZ1R7_eob9z@waZFN2F*t2nX<1c5XfH5vIZ<<WIZI<S
zI4ep|3U6p_LT!0gV|X)9Zg6)BEiEk|D{Em%N-#}wNpe<nPg*i7NHSMUYE@V@M?-OS
zYC~8yPj)XsNkL6=S8`(t6#y4IZ5GUs#=1WkBw5nOKYzi-p(M2qPmHGFU+9*Pcw;y*
z_2B!`dQRdeaqP862!J9-Jqc?Mz|PL~R8*1Pz$6*X*>vOh4#tJJr09OcIvObaqI&sy
z;Wox_k{`#e<|@}zts2yw(Mv?oJSHfR+~?FJ?e=W#30?~U2Qfui2JJ*kT`<FOR#{K^
z9qg3Ro`2A>xeoo<A@_bqD)*HGmEj@B;2P~CMbMfVzxe0Z5=xVh(8%$@{Y%{NWmHge
z;-O~Q2Hj~NVDobZ-Skc8?@mxa7ADEe+mDIHC;tWxqBunjeVQJB%aB4eWP?w5KH(dV
zib)LKl>zVVR<7-5c+BS0akU$YhFgSA<im~Tr4+*F03ZEMw%p?H2h<&BWq{U>qw2!u
B5W)Ze

diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix
index bf0f8ec..e3c78e6 100644
--- a/modules/secrets/secrets.nix
+++ b/modules/secrets/secrets.nix
@@ -15,7 +15,7 @@ in {
 
   "lohr/shared-secret.age".publicKeys = [alarsyo poseidon];
 
-  "matrix-synapse/secret-config.age".publicKeys = [alarsyo poseidon];
+  "matrix-synapse/secret-config.age".publicKeys = [alarsyo hades];
 
   "miniflux/admin-credentials.age".publicKeys = [alarsyo hades];