Merge branch 'main' of ssh://git.berlin.ccc.de/cccb/matrix

secrets/grafana_secret_key.age

@@ -0,0 +1,17 @@
+age-encryption.org/v1
+-> ssh-ed25519 uH+n1w 55Lrc+d1ob+lncF+9PeowOUk6pfN5H8pYcKze8Yh9Ts
+hrIsGn3VbmTatB41953JkzKpsFy1ClaDzV3dDDHd/mg
+-> ssh-ed25519 EvLbWw Zvm46/ZMQa2bELLpS/sg/gUejfeh6HhF9C/hF4W5+Q4
+Y7ibiWUZAGJ3CLSa1n0qQ0EfYlXJ1TSIL/n/S6xxM2k
+-> ssh-ed25519 dM+fLQ Y40HHJlJBSmrmiLU7uSr6M8GGxiIQ6MrLTBLHtx+cA8
+dQlUrZmO4WySeAyo1a7ZAd9r/uU1dCMdk72Wxr4Lu1s
+-> ssh-ed25519 jxWM2Q 7/C5lcAq1AuuydbQPBD/hFmbXHyL6/lxqfAW8IDvm0g
+Wj8GgA0/fhNPnLTUFMuBo/qvBMsx9f27nrS8BwLUHLo
+-> ssh-ed25519 /yCUCg XUJ0s52LivXboJ4EeMGamFvzTlSfQKBB8GG3Hbv43Cw
+SnWMJ9TnOjFLsHhXNusiT9OInmyICsrJVceVUEF4USA
+-> ssh-ed25519 FGp51g qZrVsdh4binpAi42bk3s8PhykxkS76xY901grBeDyjk
+Pneymp2y1kljGodCk/OIiBJeWNG86ZeXUwo3KqJ4AAE
+-> ssh-ed25519 yoCmaA R4J9TeYunLSrLnbyz00VoKcGJNR84YLusoKGgxjuiCk
+G+zmtvQaYWcVPwuD+jZKBcs0yzR9LSpCxjNOpt/hGQ8
+--- mXNr0c7WoNFuGQ2tPiwYpEJFYB+7S8VYrdKeSHwrhWU
+8N³â ÝÜíŠ~ eÖÝ $JÅM…é]Nç‰=ÞãÛÓôx½•I^fì;&–ÍeÅú9Ñér4úh»§¨y+G]^<5E>Ú3ý¦4ãðê<èØ|8¶ñ<C2B6>†hOîu¢‹<1F>E

secrets/matrix_registration_shared_secret.age

@@ -0,0 +1,18 @@
+age-encryption.org/v1
+-> ssh-ed25519 uH+n1w iJTC0uBAjAY8yR/2RUbHqrVlx+Lxo+biVre9vl2IeV0
+VjXPsBklJZ1jxnNlgl/GQS0aaMBjj4+UhIjoGGoBCkk
+-> ssh-ed25519 EvLbWw NnI9yniKw2QMwzPh5jDQPUiv1XYHyo8fGpgJMyIslgs
+vvVahqlbvOWozsBK/4fOMmH+IhUuBcOadK2rYiuYGgI
+-> ssh-ed25519 dM+fLQ lkMOaDtiDHWFRJFTOejZEZLFiOv238xkeMP8ap7WJ1Y
+VTJig9b1c8z7KGleyYChzoehjwy6uZ/bInBhY8vE1o0
+-> ssh-ed25519 jxWM2Q gpIbb13+QOC5fyA2QcTpB+DgrV3CgcESxRXZT/vWrQE
+bVVxbpKfN1Uzky85kMabnDrl8/E1ZquS+FRFzuzujG8
+-> ssh-ed25519 /yCUCg yR0+oUP7sn60oufmJcUljTAeIGfAPm0+nQ2kMeIIlA4
+TCnXv2zhEJ77lpX4wyPsmdRhNb3brh/Hx69/bl8aVSk
+-> ssh-ed25519 FGp51g OL/y1UueVo8L5L6KWU63h/kokeoM7tNiYjuHeHkupV4
+kY7cKDj9xMssTGNmSL+VWJbaaW4Bideb6ZHWQ2S8zLc
+-> ssh-ed25519 yoCmaA mrzkQsx0MVJjcGp57WdU7cTqab0PsTLiZ/JcHrjnnEc
+uoZqidxPeuwskj+6zyXzYA7umucbBuy8ImrcRXWFSZ0
+--- kXz0VBP8kJ0Ca11r6owy8QAKAyXw5PU00LLgnGQR/EA
+A%zkqgPƒWÎãHg@³‰™Ž4
+ó¨Ã²ò{ýªr胕’vÀmm¨\‰ñë&I`Ï¥0)YL:ÊN¼¾uYÔ„AgÌÛÂ+F9Mæ΋ùé,drv?ª-ø"Šâ”

secrets/matrix_signing_key.age

@@ -0,0 +1,17 @@
+age-encryption.org/v1
+-> ssh-ed25519 uH+n1w 4o87n9J5BB5e/X5sQM+8HOczgSye/WijcvOrCUM6d3I
+Ye8imH528eWpCJ7SSxf9eogBzoNYdYGfYHZaZLzUKB4
+-> ssh-ed25519 EvLbWw E8bQjHPE783T5Q6fYjCd4dlVGK5CgGUjHBn+tXz9Qmg
+PQArA8KnQ2xB8JvCN0CNtBZZe0xiHf4p3cHwJ+qEzjw
+-> ssh-ed25519 dM+fLQ fbA5v7Et6b11JIeDzl1d/Nff1FPNVT07ISL9ap4TehE
+/SG8ePRf0GXrqT7bEvwpf2wa31J31d5Di2rgeQcdRwk
+-> ssh-ed25519 jxWM2Q uClXpHlke1YRyJhye5twdSwUNI8JpQSz3eGkFEFHKGc
+XF5DiSO4cZLIaLl04y2zmPguIpufcw+yAx7L8UbudV8
+-> ssh-ed25519 /yCUCg MDYtCl4FvqBLb/xC+7Rt3tYeQ2Mi5fbOWl2aKdPSJQI
+8iQSqlMMj+VCOBBKcyTvS3p4lJsN5h6MPDM3mnaWNlE
+-> ssh-ed25519 FGp51g 6lALHIQk3kpc/9rrXEwuG2HXAHGP4sGBTZNO50jMRkI
++GbZjITsBCDzOPEHgp945knlYlsYC8ObNbUQmA/DsME
+-> ssh-ed25519 yoCmaA G2n3ZtZ5gyDSABy0wgyy9feImhprTFOZpEIwNJLJjBs
+P99b4Q1ghNW9slWE9wVGgQX9j9vDZUP6Lumnwc+EWw4
+--- NCjPsR2/qrlWPaHya7ucG9xFuPAMVwJjSCC40HixNhY
+ý(ÚE`ú%úFÀv.“óÔ§Õë-bÑþGâzS÷Ê´HjOö{3Eó»ãchnlYs'¥ŒL©AÿI8N™bn¾Ï½oe"jX gŽp]ãààeÊ `Q2áûÏ›$Ž

secrets/pushover_app_token.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 uH+n1w EMOmmGlZ2rnqAaqcHHQ9conaa8YH/3TBFRpUlssNuGw
-jyXUxitYHc/vNpab9winTCqCWBQYtmDGdZortYYlMAI
--> ssh-ed25519 EvLbWw K+NOnJui0ASn3lPsP1xZ2X4fdfSBQ1woOnD3c4Zk/xE
-FDYbrduCSWvo5NSzyAgwNa7tU4c3r7Fcoizfph3fqF4
--> ssh-ed25519 dM+fLQ Ji3jw0haPByWaQ68rHxFmj1xjSG9EVfyYTtZZpAFYFg
-cHPTEfHWjwIVUBaDB85vGCfatd4Wtuq7QT3mIcdaF7M
--> ssh-ed25519 jxWM2Q ZTbjGk18JyognAJwUQIfwy3YlHALXsfyUICiGrG/ij0
-/eyD/UoQZ33s2geZ6212ZMOLhyzKCbryR1HDYW02dfg
--> ssh-ed25519 /yCUCg cM7meOfoTt4UlsODZeSrLFkMtIAInASm0uDrMHDDnXY
-LCdZCjhp+/i7bGkXhHJ4Jv6C2ikcPsL3i7W/tap7AMs
--> ssh-ed25519 FGp51g zZFF/qLQDbKpkBQiEJJQrtoJVxrdrWeqziwNq/rP2jY
-jJ/ivlZIfn6/oh7yZSCNmQGikvwdSVAzxkLj/tc2Eys
--> ssh-ed25519 alMFaA y5NuhEOK3lijncBscuSCfOTpepiIkAYW/W5kG+wscRE
-a/z+2jHk1ERmNXFv+h1B7BpavjbemqOON5ruHP5U6dY
---- 6e7V59HtYHOi9koxczT0hwL6wk1/QkmDOkUGGlZCmo8
-[5°Ì“¬rl*X*…_€'-˜ú¿`‹“ó|<7C>3A<33>3£N>¨Ñ•
+-> ssh-ed25519 uH+n1w CpismpignW6KyCMQzoag+R8oimzZHES+0yGksCcUMho
+sDwfn3wJrFC9IDenrh8eXgfHoqTlJNb+vyF8xyJrjZ8
+-> ssh-ed25519 EvLbWw 7HOXQ9JHK0wRtmW8wipPQoQU7Hl2mzuEJR3yhSQ8v1M
+ju2NYTnCUapa9XIq9mF1ydItVa2GSE/aBhep8+4WxqQ
+-> ssh-ed25519 dM+fLQ gTVxxgX+4FROshLyPkU98DWcXg0vsra/37JzS8tSRGM
+454qvkc89sxBQeP/xtTA/g6YsKnPYkpFD1JQshCcWQ0
+-> ssh-ed25519 jxWM2Q UNp42zqLcZT1E3/CfzyNdE74gQJmq1NcLjj83m0pAg8
+HghuogwHIJ1PTYbdtzhSREOxBoItUAb0yA9aMff1Ha4
+-> ssh-ed25519 /yCUCg nDHhp+yPDpRKlpJSx5I3BR4R3My1ivoCNbSCGeFM8lw
+JCfjM/9x3vFdOtQAQDGvdPhUnCD3ztIrK8BN9nafnKI
+-> ssh-ed25519 FGp51g WJA1Z5O3yxtypMLG9m4l0mjQrw6XMe8/JDvY4QGFgRQ
+TlzGrdk3A0tNyY0ZkDORqe90x7Jnrna3emCXOHIIg4I
+-> ssh-ed25519 yoCmaA BCwjqZS92x24+UThVDbEqPopfQnKthAXkOA1uxQjiDo
+zX+u2YP/lXJOvPvG30HLNAOLsJv7QT5IU9d3w6aSXeU
+--- I9YP9v5qBtGoN7epTH7gLqFqFPml3THjnE0y7H5f17g
+gêi¹ÄyT`‹!|8£0¿õ!àç˜Y¸³øȤM°yµ‹Þð`§

secrets/pushover_user_key.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 uH+n1w EMOmmGlZ2rnqAaqcHHQ9conaa8YH/3TBFRpUlssNuGw
-jyXUxitYHc/vNpab9winTCqCWBQYtmDGdZortYYlMAI
--> ssh-ed25519 EvLbWw K+NOnJui0ASn3lPsP1xZ2X4fdfSBQ1woOnD3c4Zk/xE
-FDYbrduCSWvo5NSzyAgwNa7tU4c3r7Fcoizfph3fqF4
--> ssh-ed25519 dM+fLQ Ji3jw0haPByWaQ68rHxFmj1xjSG9EVfyYTtZZpAFYFg
-cHPTEfHWjwIVUBaDB85vGCfatd4Wtuq7QT3mIcdaF7M
--> ssh-ed25519 jxWM2Q ZTbjGk18JyognAJwUQIfwy3YlHALXsfyUICiGrG/ij0
-/eyD/UoQZ33s2geZ6212ZMOLhyzKCbryR1HDYW02dfg
--> ssh-ed25519 /yCUCg cM7meOfoTt4UlsODZeSrLFkMtIAInASm0uDrMHDDnXY
-LCdZCjhp+/i7bGkXhHJ4Jv6C2ikcPsL3i7W/tap7AMs
--> ssh-ed25519 FGp51g zZFF/qLQDbKpkBQiEJJQrtoJVxrdrWeqziwNq/rP2jY
-jJ/ivlZIfn6/oh7yZSCNmQGikvwdSVAzxkLj/tc2Eys
--> ssh-ed25519 alMFaA y5NuhEOK3lijncBscuSCfOTpepiIkAYW/W5kG+wscRE
-a/z+2jHk1ERmNXFv+h1B7BpavjbemqOON5ruHP5U6dY
---- 6e7V59HtYHOi9koxczT0hwL6wk1/QkmDOkUGGlZCmo8
-[5°Ì“¬rl*X*…_€'-˜ú¿`‹“ó|<7C>3A<33>3£N>¨Ñ•
+-> ssh-ed25519 uH+n1w HTqQauCW1UsrG02sXuh6+d81ccDXxuICmLgXp+EJxUE
+wRo53sJ4nECI17A1QHJPycecvv9Vv8e0J+PS/sAyqIw
+-> ssh-ed25519 EvLbWw RRqLwCd1NgUCRXcEF5k3+Gp3xeI0wscX8dYfYdisJTU
+u2m4/DpD16jgO0mDu09/CekJK/uAS3ufQcQYDsay8AA
+-> ssh-ed25519 dM+fLQ SgDFIxeGQxv72Bo+hgxFRBnW6bD0pAoP2Tqz4D3d/Ec
+Emi7INrfeimLilF/Dtb2twmgedtyCq+Fp/sTB+NeBtE
+-> ssh-ed25519 jxWM2Q 27h3w7OD9Mv8Pd4O1eAc6e2pzRD6R1TPeyALnzh2r3A
+PvRdyDvHYMEEhGobaZPsNl80hcfMX4QBJI0Xmt/QXds
+-> ssh-ed25519 /yCUCg SIKJiDq+ibPUOQjcjMCFuH53LhBjKjcrb9k3DZs3xQM
+ZeHS04Pcdykau8AHQr/U1IAmd4j15CZvSGJ8sC3H3po
+-> ssh-ed25519 FGp51g VIF1TFzuPNVhEjF3jnBpte9m3VF1Z7IaHrvO+3Rr9i0
+QszHp1w4AxfqVr2/h9RU546sFyik6DTSg0qY9ItZtCU
+-> ssh-ed25519 yoCmaA cZd7lZ4MAvBqnEgLhk1cJAgvbI7lR4zmXcLla3GKoUE
+s4rWNU4yFRdnTfDLVAG6JupNe7PyVx3wZKaOKsycff0
+--- n/y1v04doS7QVo+ZepIgG3YBMXcaKm4h9y3wPMjeupU
+Gƶí–jæó¨!!óÐYAÑ'cFü=XÐŒ!YU™WÛâ£Ùž

secrets/secrets.nix

@@ -14,11 +14,14 @@ let
     nyu
   ];
 
-  _matrix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7AZkepRXoY+DJeSLOU+GR60S62p6+0X/PDeEUZ0yHx root@matrix";
+  _matrix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIApAkkhHLj918co/wUGuyW8WCPYHxsNM4uo32XDEu7VV root@matrix";
 in
 {
-  "matrix-registration-shared-secret.age".publicKeys = users ++ [ _matrix ];
   "matrix_admin_password.age".publicKeys = users;
+  "matrix_signing_key.age".publicKeys = users ++ [ _matrix ];
+  "matrix_registration_shared_secret.age".publicKeys = users ++ [ _matrix ];
   "pushover_app_token.age".publicKeys = users ++ [ _matrix ];
   "pushover_user_key.age".publicKeys = users ++ [ _matrix ];
+  "grafana_admin_password.age".publicKeys = users ++ [ _matrix ];
+  "grafana_secret_key.age".publicKeys = users ++ [ _matrix ];
 }