commit 8ab722ad815fc122ee088a1db6a13f44729e28fe
parent 9a9dad94959072f76b38c21c8c40c27eebb562c1
Author: Leah (ctucx) <git@ctu.cx>
Date: Sun, 23 Oct 2022 12:42:11 +0200
parent 9a9dad94959072f76b38c21c8c40c27eebb562c1
Author: Leah (ctucx) <git@ctu.cx>
Date: Sun, 23 Oct 2022 12:42:11 +0200
machines/lollo: move radicale here
56 files changed, 254 insertions(+), 250 deletions(-)
diff --git a/configurations/linux/services/dns.nix b/configurations/linux/services/dns.nix @@ -12,7 +12,7 @@ SOA = { nameServer = "ns1.ctu.cx."; adminEmail = "dns@ctu.cx"; # Email address with a real `@`! - serial = lib.toInt ("2022" + "10" + "23" + "01"); + serial = lib.toInt ("2022" + "10" + "23" + "02"); }; in {
diff --git a/machines/lollo/configuration.nix b/machines/lollo/configuration.nix @@ -18,7 +18,12 @@ ../../configurations/linux/services/syncthing-nginx.nix ./backup-vnstat.nix + ./gotosocial.nix + + # cal- and card-dav server + ./radicale.nix + ./scanner-sftp.nix ./airsane.nix
diff --git a/machines/lollo/radicale.nix b/machines/lollo/radicale.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +{ + + age.secrets = { + restic-radicale.file = ../../secrets/lollo/restic/radicale.age; + radicale-users = { + file = ../../secrets/lollo/radicale-users.age; + owner = "radicale"; + }; + }; + + restic-backups.radicale = { + user = "radicale"; + passwordFile = config.age.secrets.restic-radicale.path; + paths = [ "/var/lib/radicale" ]; + }; + + dns.zones."ctu.cx".subdomains.dav.CNAME = [ "${config.networking.fqdn}." ]; + + systemd.services.radicale.onFailure = [ "email-notify@%i.service" ]; + + services = { + radicale = { + enable = true; + settings = { + server.hosts = [ "127.0.0.1:5232" ]; + web.type = "internal"; + storage.filesystem_folder = "/var/lib/radicale/collections"; + headers.Access-Control-Allow-Origin = "*"; + auth.type = "htpasswd"; + auth.htpasswd_filename = config.age.secrets.radicale-users.path; + auth.htpasswd_encryption = "plain"; + }; + }; + + nginx = { + enable = true; + virtualHosts."dav.ctu.cx" = { + enableACME = true; + forceSSL = true; + locations."/".proxyPass = "http://127.0.0.1:5232/"; + }; + }; + }; + +}
diff --git a/machines/osterei/configuration.nix b/machines/osterei/configuration.nix @@ -27,9 +27,6 @@ ./pleroma ./maddy.nix - # cal- and card-dav server - ./radicale.nix - # websites ./websites ];
diff --git a/machines/osterei/radicale.nix b/machines/osterei/radicale.nix @@ -1,47 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - - age.secrets = { - restic-radicale.file = ../../secrets/osterei/restic/radicale.age; - radicale-users = { - file = ../../secrets/osterei/radicale-users.age; - owner = "radicale"; - }; - }; - - restic-backups.radicale = { - user = "radicale"; - passwordFile = config.age.secrets.restic-radicale.path; - paths = [ "/var/lib/radicale" ]; - }; - - dns.zones."ctu.cx".subdomains.dav.CNAME = [ "${config.networking.fqdn}." ]; - - systemd.services.radicale.onFailure = [ "email-notify@%i.service" ]; - - services = { - radicale = { - enable = true; - settings = { - server.hosts = [ "127.0.0.1:5232" ]; - web.type = "internal"; - storage.filesystem_folder = "/var/lib/radicale/collections"; - headers.Access-Control-Allow-Origin = "*"; - auth.type = "htpasswd"; - auth.htpasswd_filename = config.age.secrets.radicale-users.path; - auth.htpasswd_encryption = "plain"; - }; - }; - - nginx = { - enable = true; - virtualHosts."dav.ctu.cx" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://127.0.0.1:5232/"; - }; - }; - }; - -}
diff --git a/secrets/coladose/syncthing/cert.age b/secrets/coladose/syncthing/cert.age Binary files differ.
diff --git a/secrets/coladose/syncthing/key.age b/secrets/coladose/syncthing/key.age Binary files differ.
diff --git a/secrets/currywurst/syncthing/cert.age b/secrets/currywurst/syncthing/cert.age Binary files differ.
diff --git a/secrets/currywurst/syncthing/key.age b/secrets/currywurst/syncthing/key.age Binary files differ.
diff --git a/secrets/desastro/restic-server-htpasswd.age b/secrets/desastro/restic-server-htpasswd.age Binary files differ.
diff --git a/secrets/desastro/restic/syncthing-audiobooks-orig.age b/secrets/desastro/restic/syncthing-audiobooks-orig.age Binary files differ.
diff --git a/secrets/desastro/restic/syncthing-audiobooks.age b/secrets/desastro/restic/syncthing-audiobooks.age Binary files differ.
diff --git a/secrets/desastro/restic/syncthing-bahn-richtlinien.age b/secrets/desastro/restic/syncthing-bahn-richtlinien.age @@ -1,10 +1,10 @@ age-encryption.org/v1 --> X25519 rcSTvn6b5LaRO2UBDTCzaeJ5B39IuSTkdT83hJTOu00 -K4zi2qxxgNjTrtSgZ7XWKtaaNrtsz87aMjK7wEuW0QE --> ssh-ed25519 VgQ62A ffTngcwDboD09MKzV1iN9hWsLkLszt1blosVFu9pfns -HDST1NVHY59tk673IpbRLpMhb8izBil1san0xsOR+AU --> -PM@-grease _!Nm5g3Y > -NdgUyHzngziwHLA3sjzhyTpsAWEVkseg6mPbuXxQ9K3sDjmMDj6KO+I/l5h8R4ai -xY9V7k2TFw ---- Zv2G3ju5JHUXcnpfAZ9zqabRU7PudXZI5ArRHzViG2s -2<|벻 s:N fix3mE&#j"d*- \ No newline at end of file +-> X25519 PQGZdBI1vUCz6cPtqp0IWlAnSuv9jWXS7UDJuwaITV8 +ea/8PDHSuA8sv72/KexXeK7i3ReLbrJ8kEg0zipRPqI +-> ssh-ed25519 VgQ62A tEGkGit2P5aXRn6H1BBAZjXf7eKvaCmBL31n+LibfE4 +tlJeqPOBpdcAjdZUuRYvcX1iBiaCAG3xIgifMBzkXI0 +-> 5%Kuf0A-grease #|h- <_O |N[ *\-K" +EcMrFUZo4D9oMYI0Ka7MbdR6ERDBXSuE62Tp95T85KRWwVznkGKF1lZE+7EuOFUu +zalQ42rm4w +--- Uu+7m/5GQWSPmCoBaXojeLaupnMeyGbxmju8AguFUTc +B% Dx :^[e"F9_pftUs_]zny"! X(+ \ No newline at end of file
diff --git a/secrets/desastro/restic/syncthing-blechelse.age b/secrets/desastro/restic/syncthing-blechelse.age @@ -1,11 +1,10 @@ age-encryption.org/v1 --> X25519 0osLK/yqqVrJMOWNlSCgQK3j199EXBu2nWjZqfMONC8 -mnxm6tYvsfVnWW7+wMnvpvREkAVMOXYdlETXQPE8z3I --> ssh-ed25519 VgQ62A QKg6uNk0cidjYix21PWqdBZzpuQNXxBdwqSVBKFkEQg -SwomyC/CJFGR2aqBcF5mG1mLG+JT+Js0t5iW0LSpSKw --> o<-grease q] r3k;=<i. :2 ?eea -elJGoFObmMm2xMLYP7Xjaxdy0xqIoG640EL2cEHahudjYYndCUQQTlSS0BHbKjzZ -ZW4ii/6b/EgB0Pd6sL1jR8NRxoT5R2LRPC0 ---- F5lWEAIIUtWC5ZYxrghtIKNl+17bYNue62aF3AHJsnI --¯7F kl*7{o6 -oԱ 5PzmQC*}lz)`QX- \ No newline at end of file +-> X25519 WnrAOPOhphsgiMAtragJ5bRnNxDjRXkDy2XB6aYeRW0 +9Gy1qfeDww0cRlT+rT3d6uhpi14lTAun0R3yn+b7adM +-> ssh-ed25519 VgQ62A 4HlBhp6xBuvtpftUZ/yr6FdVCgsKdsN8K0DXuM11Ex8 +wFWphYprVBIZB1K7P7gCRI974KzarIyj2TIMuZU8xdk +-> Q2Iq-grease LW^^@?in +6F3GlGBq8Fia5fHhtk5sVewex4a3jCbGL+0IO0pPGNFnr6E+EA +--- BWMCWMNg4kXDOdxmHn4HysmsOnoTDnON8+Aqf9A2K/Q + +rqTQ<n92Qy뺧-GIL s}1ԙͬ+f%^:+ \ No newline at end of file
diff --git a/secrets/desastro/restic/syncthing-cutieshare.age b/secrets/desastro/restic/syncthing-cutieshare.age Binary files differ.
diff --git a/secrets/desastro/restic/syncthing-documents.age b/secrets/desastro/restic/syncthing-documents.age Binary files differ.
diff --git a/secrets/desastro/restic/syncthing-media.age b/secrets/desastro/restic/syncthing-media.age @@ -1,10 +1,11 @@ age-encryption.org/v1 --> X25519 zrHqRULui91nanXKFP6UfiqWEiVCMsVVjOdRgrkNRVY -Sczj/bM3pD1uQEpZ2fPB3E3NTBS5x3h9Abqr8I/s50o --> ssh-ed25519 VgQ62A hE1nXWXuHQioyoeR6WYhOb1MTD5r6iuenuFIHxIeJWg -TQLNRH5/jSMuauSf28004+0s8Ofv0iZMRupWWafBzn0 --> q-grease QK}L -DPIONOZ599y/CR7CXSSDY0Z4DKrFUXQe9AyLt3Y22c45olK5bM3/FHQajg ---- ZVF/e2kb/0/e4gPdVfVbj5w2alV9t8IXFZn3dpZz1GM -ъ5椎Qp -*z4P)Z̼@+6elF- \ No newline at end of file +-> X25519 jsZK1bhzXjR+0l/USiPjjetowJfUC7NUHGjvlCp2cGM ++j8brl/4sN9yTCvvv3woIY2cHLGov814E5TBb8SOfLo +-> ssh-ed25519 VgQ62A 44VFsxZxNAxIzBNEDM5xY8rk7f6Ceaadbln250Qye0c +3grbs2qaVFKejiso2sYpPM24CG2rJbS6NWGk5wuFHJM +-> ^4.^4D-grease P &Dy m0K^; i>y|sV" +z8htFD+iGmyH5k0aQ2i+v8U2DVOT+Uu9w2UwFa84WocvcsnvXsSmry+4+ycGukW+ +54wPxZBhRKoyVPWAuLI2N8JFWPMczKhrVeWPBw1YDAy/MoXzUw +--- tNFytdoG5B/BrzDbnxr2w3jEVmxVf59jEVRUXy806sM +Kkҭzwy rgq v zVi#^W L>"p) +\+ \ No newline at end of file
diff --git a/secrets/desastro/restic/syncthing-music-orig.age b/secrets/desastro/restic/syncthing-music-orig.age Binary files differ.
diff --git a/secrets/desastro/restic/syncthing-music.age b/secrets/desastro/restic/syncthing-music.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> X25519 K3ms9DAkbMFn34VybdnZF/Op1SHbJM/vkbMNMUszXVQ -cfY0eDc/Ex0QcQiAce8hgzeVWdg6V1JwuhE4f+NdAoo --> ssh-ed25519 VgQ62A Du1Mbs+m1bV6+n21XOMjrshAKj3vgFJYH22ygnMkdxo -X4vTG2wfM9Xy17DIoxv+DELWkZ37s1egPLbSbcCbaj0 --> u|-grease -L6g+wW9tG4xCi8u5xRP/7C2Wok27CxE3keYgyEw326vjji8kxert22STXfsxXkrH -4puLuG/u8D8DH+BcKLcnhwmw6mmWzdXT4NuM1o1UB/SNikA ---- eAcTfu/sYlG2Sg/y04e0yPZpSgYGcEAUBt58RFCsGHU -3AK-<ao'C?=C'382[Ӓ %ɖpkx- \ No newline at end of file +-> X25519 xIsmw27ie6u5vbtvbA3HxwIMfnEuBaRxfr9a+GE5WF4 +myQf45Z5hG+7F1CFMnYtxUY2DX4S9V19Jw+Qn7/Tjl0 +-> ssh-ed25519 VgQ62A WTzKwaZHTBaQHgDr/Dp7AKVripMa1v9y2BZt2aDPInM +2IJR1ouBMxqwRyuhpKHJJggFYyeXnVV53xydrOb05Zg +-> _2l.8-grease +D8sS9wV5d3pkwmHOaw8AfAlycbLbsjfUOscl1n1D +--- 0T4eaYArAz/pUimE8jDbMh0chooUPt3QQZ7LBcJozjU +OTX?%% v ̀,o*ƯhgtU@]E+ \ No newline at end of file
diff --git a/secrets/desastro/restic/syncthing-pictures.age b/secrets/desastro/restic/syncthing-pictures.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> X25519 GxWAwewTihYRweIIfdhrfL5gg3iYnk22sQnhChhrdio -htbKAmxLkhqoR99KBpwUX0P36bPdVVrGRdLNPGQgfQ0 --> ssh-ed25519 VgQ62A 4PkLRuiqZdGuf0UV2AY8GvECvUsMDxfhe9/2oomPEC4 -UMikL2pgOQcIKAldXRLP29IzSO24rIjmENrjnsLkU+A --> StWG#:-grease s2\MM" x x!/a* &cPPK!b -DkZNTN7CgmiIFibS2d4e9HeF7iIgjjdcEXaxK6n1vPQgCco4i+opXTD4EvnlCRfF -QCXKBEoDBK/GY9uPdH8oqSJA ---- 2DVM1KnKlkaSUWwAkkPGsJIVrxA23ru1L+pP44h7WXU -:^}X%fVZM&6֢fF}jDtޘR${7o- \ No newline at end of file +-> X25519 cZXR1o7Ich4mB6OxwK301PKecpxTXET6xyIt0x/P5Xg +qyVdcdAZUMlGnq5RHpPiP2bRWuq+nvI9RMIQ2IajOGQ +-> ssh-ed25519 VgQ62A LIUZ8ji1xIlAhcrZfOMWbHYCnw3wvvZ5M6CP43jJwzQ +1pT8dzX44VL/aopBvA7IUvTzkCwq4rUqIBzahHhHtr8 +-> HgHU9@Z-grease J- *ull +99MJaGJlVp5oVSkrQrbaYNuIIBmn +--- 4zJm3R05IBicizdliew6shP9zn/j7e1EUVDuzwm7msA +;: nxhfWO) o sCA o{g>~&w\_6\+ \ No newline at end of file
diff --git a/secrets/desastro/restic/syncthing-wiki.age b/secrets/desastro/restic/syncthing-wiki.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> X25519 QRoTNFEc36YL124GXgoRTcgwxY9m3cw86nUJQg8A7SQ -6IXCjZOU71LPbE28bxk4/MV8b3CNZlBcn9ZK9wA/K8U --> ssh-ed25519 VgQ62A MTJ8lL3PSrLJPTo/LX9KHwUaC0RJm2EyiN7d4BvgpC8 -nxxh0emb+XPcNdCcnF+nGBHhBC0xf1q3ZXS8M+XXQGw --> 0;-grease nB|eej& P~ ~~tui<_% T -3Knul9bW2pi3si0b0nQm+LJsh/Xj/LetnlXfdn1jQlwV44m2CNBnK0E+AQNboVXx -0hRRE4j2Q8LZF3U ---- l7odf51953mMlTCR3cmZTQkrKxW/SPEL9xm4I37TWmA - 9{DNx,Xuf1qjÙNi%- \ No newline at end of file +-> X25519 BWOkhN/WsI7rgiH3Z1URZM0mnkNJRnPBsThTO9/nSmA +c/Ajs6/5INmGqBlTqoxB5XlAS9zn6LJEnNQ57yjmU7A +-> ssh-ed25519 VgQ62A savLtaQdEnolt38FoWb+LQavHo5itE4pSQF3OZFbAHs +/oVLPUApxyKmf+M5yx9tQVGpuqQ37vGaUHUna3mMOCc +-> kH-grease i d s|rt.} PdA +MHzmSAk+uihCv+gK2Effb1iPs5gzmk0fswEBdFNR +--- JwOaOBezocDzY9qjyT7x4xkBMIt1KMJz/1atNOEHA3I +W +/Mpj$aI?nYL3yį(D\t+ \ No newline at end of file
diff --git a/secrets/desastro/restic/syncthing-windoofs.age b/secrets/desastro/restic/syncthing-windoofs.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> X25519 VTUdSYZ3d4520/drtYZlHQ0amOmZAT/ltml7AF4JJRo -9vdcVovaDqLCKh/v4E9x4ny96BRBg+oW6ZI4voNgu1E --> ssh-ed25519 VgQ62A Gh40i2sVBaPs4qisvjQEbJbVWNEIJQKQYk6R541Ak3Y -TFBfXhxCh0rqspU8Dki6jUP3OsKnQ+p+PJHHVAoiOd8 --> OoYu}ZI-grease hej+ -ZbNa8+L2CKQXwyknHuOuMx57AXhhyaH79f3+d5QTokSAmkt4Wrgm8mY ---- UzB/ozkd1+tJeCYmNtuYvd8SXqfPVK+3+Veh+m9JR5E -}=jM EN|XG"i7ەMt Lwe- \ No newline at end of file +-> X25519 aAxZtFiwKx+1F4D7zUQ8K2Iu3NW/jzBsBGyZ30dmH3U +4309tNMtE7rrN1OGYYjv2YiO+j51U5F31CldqMC9iWs +-> ssh-ed25519 VgQ62A tuN7wafThsiQrVFPmWHozVCBPli+2RGWz0OErevyxGM +0ZeOQx09A2iqqzw2CcUrUH+Ws+/cJKK8wGB8Iyut5aI +-> tQvLVC-grease + +--- 2yTecx3LBjz+1CH41ATHurDm81JHpCqgrWJLO8rwFZ8 +^: +` JYEq fAo 6TLY Ι+ \ No newline at end of file
diff --git a/secrets/desastro/syncthing/cert.age b/secrets/desastro/syncthing/cert.age Binary files differ.
diff --git a/secrets/desastro/syncthing/key.age b/secrets/desastro/syncthing/key.age Binary files differ.
diff --git a/secrets/desastro/wireguard-privkey.age b/secrets/desastro/wireguard-privkey.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> X25519 hCb6Dtky/V+UrRAb0NMPUyognHdNUSgUIVmtsQ96Oig -LlGTo+nCDBCahOYwE6ASdgda35mKkSa+uRsyCn2x/kE --> ssh-ed25519 VgQ62A gVSKVDAS7lP4SNvjLPlEN1SSG1hRutxY0XkKK05mEE0 -TGKEADvBxhlf5FpyUm2eA+qOpHUVezCCVjLFgND6Ctw --> *mT-grease RqJ~R1 +Lz K;hO1c DM -bXEddX73/x5ihNAzX8TE5hyMPkFBMzoTtDFBi2hH1owuaMqmhbAIqlI ---- VsGxyfgoyBPeKcBru8WLIG3aXt6OzngIDI4p7saeYNE -\b?;%WNI;k{,N :e~P1 c 9*,ȉTcP:eL- \ No newline at end of file +-> X25519 WbsxXRTbGUYpa7nCc67mTbkPYX8tfv7ZiefQfqfYCg0 +R8xPk7D4ez/Ai3kHAWik0BuYdTgWZCZb05PPBcs6s1o +-> ssh-ed25519 VgQ62A FH0aknKzK3SV74OIgCHL186DYbdsODGEnm4XeYgdzFM +AHKf35Id0SQHSZ3IIWpo2DwDsGmv4ySfCjrWlIj1tIU +-> e_dSL-grease }KyS|N2 H7SS k +ZrqxiFZUW+TUzaWaKLq1Kwk3h1E306Azo08Jeg +--- aLunpxQrxYj+Avv9QTwCC8d/g5/FNto3uUh3WQD0b30 +Q5(ĨP7]S^bHxg|Z*sIsz %*\TUK{,_ }\zlҊ^d+ \ No newline at end of file
diff --git a/secrets/hector/restic-server-htpasswd.age b/secrets/hector/restic-server-htpasswd.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> X25519 xGKK6ieukEOXFevsNVmUyGipqUEPufHi6sQxf9QK8l4 -M89MS19Ifijk+mWVyepTwoGz5i8G9e9imnIgcK3Cxuo --> ssh-ed25519 NrwbpQ nJXhiwCY7sDNilRsrAs3C6iWyfLHicoQhI1HKDHiWQw -iJy7orayoMyKEcoXL/xXapZLD/dth3Co2SniD0pDrpk --> QN#z-grease $XBa q35a+e=? {F O(5\)$* -rWiRB4/YCwGWiaLkkxMuxl26HW8UH3TBOAR5ISn0xrVGa80s+FEt ---- h/4L8wT5wK2Pgk25SUQOhcrXF/HVCjAe4EjLGKzG+1s -&a2B?KUTI) e\a;$^L>Up)G| nJJwX- \ No newline at end of file +-> X25519 mlNf0kLkbC39+HfNhqNluw9fnwWCaIJBYtzbv4yZ2zw +m8YB36Lid4Fqh0Fz6Ril1bodNwHwg4AaV1qSoz68ffM +-> ssh-ed25519 NrwbpQ 89jCIBFHFFAfvNV3TIzqperGsdthyzluKDihBc/QWwU +i869YPiEfkdcck6Tl8ZAAsLJ1OhtUT4btqQIHPHICjY +-> K*D-grease .ISc/( 8:CGWy- : +ybKk3KVVAn9lrevkv7dnfLjRzhJFn8oUGDrDrePPDU37GufxNIBwjM0 +--- XhbOgHzmlJOEJiZzV5CuMDC+Yy6dtsyUaYKAtd36t20 + "z:ΆB7 YCuӔ]QiRIާKHF ,-/#a+ \ No newline at end of file
diff --git a/secrets/lollo/radicale-users.age b/secrets/lollo/radicale-users.age Binary files differ.
diff --git a/secrets/lollo/restic-server-htpasswd.age b/secrets/lollo/restic-server-htpasswd.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> X25519 uF6+SNBwSsIjOv76vG3H7IxeGSvqAw84F25wwZBZpyY -Y77ObCVe9chhbWynuJPSorCtrsHEYbuen96c1LaiGkA --> ssh-ed25519 2LuoZg HueTEZaPXcJ2AQi6VVkuzg1DerN+qvYanyZNQGGF4kg -xkN/VCSphMAUPf5d1URXU8at+OGRx0T7Vs5y5Gz7E0c --> FSKK9-grease -nP4APuXeHjEc4opEOwya+7he4GEkeP29RMvNM/7rlHAYXnF4rgj/ogAHFqA+e9ic -eRYDzWJQsPTpfvquw/oimZhaAwUCY9uzV6oFOAx7g65UePWUzS+SX6u44FRAR8s ---- A4YKSnbZqi3bv12gFMDcCjXZ7golzPfBfSWEDFDChcI -m|"T[ Sibe!fQlHA+P!UxWܷ uq- \ No newline at end of file +-> X25519 xHTDuWwyuxQe+c9LRQ6EKtU2s4YHBZwpo7kKH54xbFE +9FC+xBjiv5o9BMxXVxpF9R2RCWF3lN8DExeaQBX4kD8 +-> ssh-ed25519 2LuoZg t4MzfnivLb3WGvXhtf6MolRAe4r93qXpruNuDShLiw0 +Ad29o+IZ153e/leGpOunyEHMksUwWRW5EtffM617w/g +-> }e'9/i-grease +P1GFi16K3cgHQ/+B8W0j+2cDDgk +--- 2Gk7yDXQB/20WLoOuxpgTkcDY7XoWi65Mn2WBA86SME + FBZ)X6=bbX1x7EjrV'1WRx[?D|L=\v+ \ No newline at end of file
diff --git a/secrets/lollo/restic/gotosocial.age b/secrets/lollo/restic/gotosocial.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> X25519 aWGlm4xFWKq/79swCAwZSR3qrJeuIHll0Es0u9F3+3s -8BrckcrVghxXy5yK6Yout/bXsTaXpOAWWFcneeiBbII --> ssh-ed25519 2LuoZg aEmCyix8wktWsZVP7wQPW+nRYdNh93IfZHYJwPfz1Ao -P/eVk8nRtE73jN+lNQ2hjGuxo4AQhQATNEJuCMm2v1w --> wj.2P-grease -13lJwg7qGfSYI43wglVG9TpX1Us7JXfREO4xe7D7gSsd8UhJqyA ---- PH9kvs3YiWwmtnFtw4o6IQmTn32GNifhjZ92W9JHPeE -?v#0W#4&V\,f3;-X|>ˇ7T\&3t+'C/- \ No newline at end of file +-> X25519 ZU6fVoyVd6U0E7jRUsYjErR8b8N2598jdzuhz2bIQWg +qEzm5LNz9mBuzo+esof5mhCCR9Ezjut64wk7sQKkaX0 +-> ssh-ed25519 2LuoZg jbeD2tAFoaSP0Vovmgtfzfs2Kv2y8Ic+C87kCIxTC1w +a8eOLjKmEWhRVqoa5PtPyvsG9vk0dbQuVHjyXOvOpXA +-> "Js--grease s9C%K93@ +QeJzrvTkRzd9WQVM2JG2ViV7b+7aWOauZIA3hEkEm/jIQnSnwZ08S1+SIEcqJdJg +joOOQdubX5m6VMk7tdnloRW2BA2zzf46VneKhkQ +--- FnisGJXqRyfVUa+ZB5VIC/hpg5l8VETDiFMs27peGRM +[sL-r-JxA2ӫ^zSqV+yw,AHVx~- N+ \ No newline at end of file
diff --git a/secrets/lollo/restic/oeffisearch.age b/secrets/lollo/restic/oeffisearch.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> X25519 AcVaByDpLMkv/8D2Uu77LxlSkpbeRNZ8SYcJtSKVS1A -+DRBAGYECJ4i7f2oO33tjvffvyRHC6thq8ygcD4ZS38 --> ssh-ed25519 2LuoZg 9/KrZcs6+d9pp6dW+YrAebMOrSHqUx43hVQokG9L0Ck -6iGHu1p17cl9ivbS3wGMI0E0v1UvliH+KRulSK7rnmU --> :crc-grease $ -ODTZp1+V4DpeCglNy9RWQ+esG6wMJVqt17nMF3nRcbgyMIg17rCcp+mLyRZu ---- 3DWaAdTvlFnPa21kSs4RiyEJM1y0CRjM0sMCG5GUFmg -%#*fI =)3Jg<yhS֧="-E8uW eeä]"W<- \ No newline at end of file +-> X25519 kovjbrmMk5gK6hyBllO9OuGJDTlQmxdj61ppKutQNHM +GruyqGp+Rv8yhM1o8qF9QL1aSqjAZCLU07e7KykPrig +-> ssh-ed25519 2LuoZg zVxCrm8NEo8kfDWKqZU6O1oAQ05YIxolurk2keJzp0g +nKKobP+3yu85Imch7/QMEE110nQFKUAYDpf9Cq/oaXw +-> g*U!ZQ-grease %qnWn0h +JsbWT0u7tWu9ZvAv41lf2BxKmQe0CV3Urv4oJc58ZLkZLbU9YSfq3QY1edN9h1fB +RRzwvAEbalQxk/CdHXtFwyb9FnXX +--- EyO4RL4Av7TB33mkWiU/oXusXJlN4DFSfTGPm+bGbSw +GUW1$:Q3WHoYil`xS&+ \ No newline at end of file
diff --git a/secrets/lollo/restic/radicale.age b/secrets/lollo/restic/radicale.age @@ -0,0 +1,11 @@ +age-encryption.org/v1 +-> X25519 RKZgd6Y07itfAbMyEshJVp85C7+ydJQ2Bv1uRUY+pxU +zbvfGS983CyNB7+GyRvheqIr2wYCdUo1ep4J5hyiXis +-> ssh-ed25519 2LuoZg dlgtH6XLPJJWGEntrjHkQK55AcXH1/ZfKAGQfpUmTnI +j/z4VrEifEWAUbbLqKk3dCzKB0HBzGlv31X2xub2LYA +-> f<-grease Z#|DL "%YH + +--- wkPzG94qlr7KvxeDdo/nobWpEyuo6aQB2x+ZFkN7xGE +N +y^J59mVv> +. ~ ")lBB/{5l+9DL + \ No newline at end of file
diff --git a/secrets/lollo/restic/vnstat.age b/secrets/lollo/restic/vnstat.age Binary files differ.
diff --git a/secrets/lollo/syncthing/cert.age b/secrets/lollo/syncthing/cert.age Binary files differ.
diff --git a/secrets/lollo/syncthing/key.age b/secrets/lollo/syncthing/key.age Binary files differ.
diff --git a/secrets/lollo/wireguard-privkey.age b/secrets/lollo/wireguard-privkey.age @@ -1,10 +1,13 @@ age-encryption.org/v1 --> X25519 E/+CznsylhT9SjwtU5MEn2oGu9NbdWJrSupoWPZVA20 -XNA1+Ke6Z1pCVWVZQl1oGhQnvnPcx8ReEeDrBLhikg0 --> ssh-ed25519 2LuoZg ici760b6qQOoVuA0YY1ESDUeGGWhrG4h4Md+vwwFyS8 -OGvSvvPRxAI5jZ2p3wWW57sQSAHRmRl1xmQO5V7hP8w --> _wO}bG-grease hm%@Nva -b+FMNdh4ZGrfTMrEEyypxI4KyEWNH0XGmafUGVJgIn3va8N5N0HUt91aeBua+EyS -m50Xr0S7ZfE1+/xX ---- zTlo4DoSETE6p62UU8TU2iUjwteblxRiZxq+GsxRixU -~ U44;vCTnҏ! u!5.dǴZ]x ߢLz@h( - \ No newline at end of file +-> X25519 HH8bVRf7B4nhro69GIQ1wnMzoXVg3sUDXeNQmzO9x0A +ZyB2SUhjetdtWCd0aS9BLGQAGvS2iTc/i5IlGqGs2bQ +-> ssh-ed25519 2LuoZg eb870qsI5CK3k4E0V41F1VFHZKpdtwx5UdfA8RKhFnw +kky5cZiygFR9H2EpS+CWxe2DDTAerL9xvSyp705DVkc +-> W0%*-grease mdNMR Xy# (;d0l +zoEIaMHWIRrH10sHQM9CnA4NFd1TYJOqVVEboWp3BJwHGe3iK3yVLBEiKVYlMW1J +Ypx1m7N7aV3Pej8QiVIN/t6Q+8s+yVLjrd0RKhqwwK86q7Ix +--- 8ByGNfNy4UJ8IgMhjIuu0yYC4Ced9Yne58X1pd8rZR8 +Ks8 +IEB*z뺿=Bz5aSCԥy +$0MPϰ5J|r8 +Kz(G+ \ No newline at end of file
diff --git a/secrets/osterei/radicale-users.age b/secrets/osterei/radicale-users.age Binary files differ.
diff --git a/secrets/osterei/restic/gitolite.age b/secrets/osterei/restic/gitolite.age Binary files differ.
diff --git a/secrets/osterei/restic/maddy.age b/secrets/osterei/restic/maddy.age Binary files differ.
diff --git a/secrets/osterei/restic/matrix-synapse.age b/secrets/osterei/restic/matrix-synapse.age @@ -1,9 +1,10 @@ age-encryption.org/v1 --> X25519 bGiXSSpcljFWgdaZLVSUCoYqhWp/Ve/aPu7+mrmUUj8 -KMlcAIroLMPwkO8dxe6HfqKwiswwESr+gzV9kshIswE --> ssh-ed25519 YtLkIw cy3kY9R1Au2Se+QT/9+7vhDAZIUkaF8FcKOqdL3Nykk -76wT1g2x1pmW/jWX+oHDjv0VC5shBSm9rH0rvCmfh9k --> J_I4q&-grease <[{lA{Q~ -xTX77WsOuw ---- tio2KLSvQZPOFv3y1pYuTJOfGGhPkDSIbqvFiuZPZfg -DGQ/;ϯL#`~UsE!+ݐ$ߏaz_ȼON51EE;ei- \ No newline at end of file +-> X25519 N4uLzI5DOm16lZUP/JedushWD0ID56FWtCZH1kzgKXo +TtHlqPvceYFGLq8ctjxrn+42HCWOOYS+XDOMznUAeEw +-> ssh-ed25519 YtLkIw VwJ28uF0VaA93Qrpxn4Mz847dhukcbDCFyb31Xwt8ks +X/MMOQzl4NlVJAgr3hnYCXDLRxa5ZcwBEJ83mS42Lvc +-> ,]-grease b Fd?g;R +0gaXCrGHZxIWDiZ102iufLZgL0Z/5NzxsXTTWpDki+LWOL6EGcZ2X11+ryoIoDZJ +KL4X4L3YWx4+rxihtrSFMJqWNufvk/qmAdzaqhAytZ4jXF2zCg +--- CXG/gR6WdTwmmxn4jGawEqLc2w7e2RgAHMel/hpfZUQ +0)]kUM%xpT{kL\&є-Wc}1(|o+ \ No newline at end of file
diff --git a/secrets/osterei/restic/pleroma.age b/secrets/osterei/restic/pleroma.age Binary files differ.
diff --git a/secrets/osterei/restic/radicale.age b/secrets/osterei/restic/radicale.age @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> X25519 YNwXbJWYRyIl176nAvaBS37G+o2Ma6QcuLji9cNzB1I -ho3usMUu69DQUIunCRJuZyiEQH7/cKLjlXrcMbwUxD4 --> ssh-ed25519 YtLkIw mjVKIZaaDCOTXSPxnw/4mdwYhcjqAD/pEqnrlZkgs1w -znoT9B77mXiL7swDEA95qhZbU0ZcqZORerkf4MA8Q4I --> 2l;!0$L_-grease RP} nV ~bp^ >ro}5q6 -Y6pJfjdqAtR/y4IXTB3D6KHM3+dAAA ---- GBDwNvtE0GXMsNVXV3hwBJYjvauJ0oDXRhe8DXbwnds -=E #bEe DjgC#[vR~"1;o.h4}up3- \ No newline at end of file
diff --git a/secrets/osterei/syncthing/cert.age b/secrets/osterei/syncthing/cert.age Binary files differ.
diff --git a/secrets/osterei/syncthing/key.age b/secrets/osterei/syncthing/key.age Binary files differ.
diff --git a/secrets/passwords/leah-at-f2k1-de.age b/secrets/passwords/leah-at-f2k1-de.age Binary files differ.
diff --git a/secrets/restic-server/desastro.age b/secrets/restic-server/desastro.age @@ -1,15 +1,15 @@ age-encryption.org/v1 --> X25519 YgxcYAxDCoinouuJu/KAzZmhbJBhn87lVAYo1P+Rqzk -dil6d9wR8n7uEp+H/ScaWdXOE3B9Wgalrl8BzhQMqII --> ssh-ed25519 YtLkIw P4uygPWxMUODSRX6Q8thv67be4ckkZwkib4QZvfTskA -T/TOGhcAA2hPEqYMYcfXU57KH+HAAdZz+Kz9EUSEUc4 --> ssh-ed25519 qAHlAg UOVmiU1QhTNBUz/OkFyzRz2q1HRR70M4Vsz+S+R8cAM -WsymeqZlrvO8nN0uk9Y4/vy/5jKHyoX5Hks/Illdg7w --> ssh-ed25519 NrwbpQ r3UrEcZJsAcI7a4+AqVwYrKLT3IuGxCY59wci3f3AjE -UIjwYKbAD1tNNWMit2uliR9NnmwIMpy/ylJ55vVJT3k --> ssh-ed25519 2LuoZg r6HB8V2Gwipv2o4sOy1Pfdw+06pPY6u+e1VIEbRwW1E -PldREAyJIc40YIP5k/Q65DTRDN4DkBCEfMb1uvdAmIU --> F{-grease % FdQ ~H@z f'Cp8M -ftFkVvxmh3yl1rbZWllD ---- Lr1dxRHdNsVmbDSJTo7zDqwZYHnAc5FRbOlC/WHu+Xw -xQOTⓧ39"sG]^VjGN8?. D&.nN5bT"06 ի!gf EjF- \ No newline at end of file +-> X25519 EIWR+ZTgzjXLk54jmmgN/MMG3Y868TBm+90wxv8TyXg +z0Rq2HcxNnz7KkKY2eIGO2U7T3XTJvEqNELcMo8VzZg +-> ssh-ed25519 YtLkIw ZVWP1dyfZwVnoog90a4RqhomCgwOfO6QcXe1B7Zbc1A +olcCZrvlNvoGI8eqPoI1IcuFCOLGY29R8SRfBk7u+kQ +-> ssh-ed25519 qAHlAg UshnbSKqoQI+I/JqLA1CyWPRMo4P7qkVBCufOqH16Bc +P3mok8NxdUJ+/Yun1GlUha6Of05EbiyOdyhXIJNKKwU +-> ssh-ed25519 NrwbpQ pC3bT5NmozenWfaGk6JPLHBLEe0gpFXotTP3Lkp6iCs +4JdFFfam4PlikD6+QPO+pZvcL5cdZUt93SijSLuC+co +-> ssh-ed25519 2LuoZg F2XLeas1tTwWIuT1Ur/dGy82hAZ3HWkWXiRJlbyGsDE +oF48HhCVgBT2rJBenHsufGqF2nvyybXVnoBS6HokbEI +-> `QTT?/>&-grease @MUik~?\ +QJ0Njf/G3tlrMLnlNuQTHMjeOEUf/mbqiWiz +--- 8Jca77NScm1VlLOP/BvP3haaXehbesp60Dd5HBiruZ8 +I2 \,ϳ zO1 ui9/ASd NiXK CVOyiXx ӰNO/+ \ No newline at end of file
diff --git a/secrets/restic-server/hector.age b/secrets/restic-server/hector.age Binary files differ.
diff --git a/secrets/restic-server/lollo.age b/secrets/restic-server/lollo.age @@ -1,16 +1,15 @@ age-encryption.org/v1 --> X25519 K8wn5t1/gJTx8RLQ6/SkxIgV4fhPeZwHrbShnKrVygE -BbsvANH9KhBGTppDmjhDkcjIin0drJVZgiL21Uabd60 --> ssh-ed25519 YtLkIw iVCMQBtDjHzCJLENOGkGN7cbrrewC0CNqL2BFfTOWSk -NU2hsgl78QCpFeOGGjZ6sGRQOo8a8FbRZnkKw+NNirs --> ssh-ed25519 qAHlAg 8X1rsQiMO387tVcd8hYTu9okemPx0YI4PmFTvzMWkDs -lrVBfawyp+RWpAoTq39ELTVIjLGi20lStxlw+J5PjEw --> ssh-ed25519 NrwbpQ Any0rqVaTxBX9c5M53tmR1/oBKbPMD6EEBa9gdIK5BI -wcJXCZyCVUzQXPcL6F4FALq9W7xj5vUAsshHs3sAh/A --> ssh-ed25519 2LuoZg xOgq3u1SlzFGvyKjn/Si1GQQi2J27g/PTfQOs+m38EU -WkUIdHX6Y+dK6TQDTEy2NEO38ZRsq4ngrEympFUDYrM --> F\e~soeR-grease @z2EQ! -jafPlZJ2uWZhmWORCagMr7FrnU8HUMPoVayh+fZP64sT7RHakbIel8rNxfKEYkCB -TvIRZLcJ ---- FjlmBjC82SbqM6pSCMP4l6f8/bsNxjhvhNkxaxC6mNk - +y(xsޱkMr\z{YT~{|3/;8 - \ No newline at end of file +-> X25519 mG3N7VAJDS01Vmb1xHgOhlKp9E/8MMmfDR9hoC+9PB0 +QMMoulMyDV71VbirjIXc8qf20KbYUdODZf5eOlcapyU +-> ssh-ed25519 YtLkIw QseF0LGaoFrytb3FnQhrJa11fit1ZpEGH//TpbJbJwc +AZv2fzvN4X8wDMpaFBOI1sxUcYkTUJHsE/5Eg4PQ7Bo +-> ssh-ed25519 qAHlAg 3hzylEH5gF94SNX4Iw2JLZKlqGWEj6mwABYDPUistn8 +Qq1+h9IdMqXxLko25LPVGgAoXc8IAZmrVURpwTnJxEs +-> ssh-ed25519 NrwbpQ erpKcckboEGrsO6dqD4anwAo4LSha3t7SGCELAUzUmw +lTfGRA2CQgV1Kgbtm7wW788gusc5iok0A1khnD1tOjE +-> ssh-ed25519 2LuoZg PZNvSXsTlEgkpsj9awQOetqZ7HGrYcEaYZPxxdKRoh8 +Qzuo8Irywmvs6Whqc0rL1ey18wJj0dApEWEHxGePtDU +-> q}.-grease GV;1$!UD $ZG&iKZ( ._p eD5!DMPL +btlJpZPSI6nR6cE6WTBt0q+J52MU16FGLd2TRJi8YnH9Jiy5 +--- MS8Sp5l90LflPT4u6LHMMWtE7QLTLn0F9LLX/lEaspQ +V;fEVAOw֒V;:GQY;~zX4[x+ \ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix @@ -42,9 +42,12 @@ in { "lollo/restic-server-htpasswd.age".publicKeys = [ leah lollo ]; "lollo/wireguard-privkey.age".publicKeys = [ leah lollo ]; + "lollo/radicale-users.age".publicKeys = [ leah lollo ]; + "lollo/restic/vnstat.age".publicKeys = [ leah lollo ]; "lollo/restic/gotosocial.age".publicKeys = [ leah lollo ]; - "lollo/restic/oeffisearch.age".publicKeys = [ leah lollo ]; + "lollo/restic/oeffisearch.age".publicKeys = [ leah lollo ]; + "lollo/restic/radicale.age".publicKeys = [ leah lollo ]; "desastro/syncthing/key.age".publicKeys = [ leah desastro ]; @@ -71,11 +74,8 @@ in { "osterei/syncthing/key.age".publicKeys = [ leah osterei ]; "osterei/syncthing/cert.age".publicKeys = [ leah osterei ]; - "osterei/radicale-users.age".publicKeys = [ leah osterei ]; - "osterei/restic/gitolite.age".publicKeys = [ leah osterei ]; "osterei/restic/pleroma.age".publicKeys = [ leah osterei ]; - "osterei/restic/radicale.age".publicKeys = [ leah osterei ]; "osterei/restic/matrix-synapse.age".publicKeys = [ leah osterei ]; "osterei/restic/maddy.age".publicKeys = [ leah osterei ];
diff --git a/secrets/spotify/password.age b/secrets/spotify/password.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> X25519 1P4BszU5f63NAx2dUdMdbCYG1Dt71+P6tTjHUfeIpRE -tCb7HxhgFOoXftiyq78r3xyyOOm2HPo30+ef5aQtiIU --> ssh-ed25519 2LuoZg WbLsK+GUypF+I33qb4zlj9ucLO68H1oILGkOSBaF5jY -yJ620RiP7YR5fVGa/8ilOUcT9cC0dvOCylv2o9i8Lzs --> U<1+c-grease ;1AFUa1 F#{q$}r }} -PnOCCF9t3H6jHt5wOpUcg941k4H2xL2HGk52Mwyw4zlgx/R+RPT6SAJ7EGC9H6Mj -IR6fEID7YKWVYnmeVJugEZYbaFPgDew9IOPA3FYEhOjA2V8/7PAz ---- RZLSkS/9HkinkAM7UCcqfO1WfntKJOF7W5sBtxb4wAc -Szc잢> ,O<!3G!U>'ΉJaٌF߆hV- \ No newline at end of file +-> X25519 gFoE00aT5LOMguhxzHVnC3ItFLPldZAmWbXAX7/dWkU +H8ObLGaSSv/b9Dy/jjuM87pQmNJQsP1h4gDsj7tE8Zg +-> ssh-ed25519 2LuoZg 7h+LGyGN0krszL3/IvVePnyDaRNMBYs5iTDYfYpqAnQ +F3XN6bu4WYISz5nfoTYnE5zh2Up52xJdt4yPKbztC0A +-> /-grease QxLg /F/Fg2 #]K}/ +QTd9Vyliq/9O+x9TDkCyiv/QBg +--- MiWPD02OIXI1Tc39GLnpo8vkuiiLIa2OA+KKhtAmAPs +>i*L8ٍz߳bt ` :- H#`3H+ \ No newline at end of file
diff --git a/secrets/spotify/username.age b/secrets/spotify/username.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> X25519 N5S7F0aPTVB0iGhbDXR4UNOFpRMdylffziX3vXvHxVU -UdBUP3C9xVmuZl/+Bf7ad6CT9ag1I8lnlRl9NhFRBAg --> ssh-ed25519 2LuoZg mx7LGHB3P9JaSbPr9h4hQKCv9U4dS1XHPRW22St47iA -fRzYgojJI9Ms2vGKmaU5msbMFH7AG3HZrKt0Y3C/VKs --> 8*[-grease 1&5y#P t. -h+leMQEyVC9rZ6MWdo2Sxw ---- g33YbhHH4O9TZdsPFT3aqCJ4KyuhuC/m+TjF+pjByTw -;Mw%<(nZ3~ QݨhΠDmN/ ^@7- \ No newline at end of file +-> X25519 kNsllvaA0VOLI1pWCsaSDUOEHeHAdmL/NGgOu3lsbmU +1RQ4R4VysErMUSNckmK3Rl2dGZeRnautHzXmh6s83Ek +-> ssh-ed25519 2LuoZg bSglFqNMU1DtwNQAaV2mLId455ehi3YII1Hbqf/CjGg +zExGiUs34L+BEO9itWqbLgmuGN5IrCiecsnLfXDLCFU +-> ~-grease :x t_r=T) !s| ]FLgT +kWwF4TMnWFnGvgXX3OAonDTln+LtbqeN/Hs +--- UZhwYKDsJBqyQAI3ZDZA/f02vGZDa/QECDKf349QCSU +9/?$)"#{{V^(K;]b R]vKkmK\z+ \ No newline at end of file
diff --git a/secrets/stasicontainer/syncthing/cert.age b/secrets/stasicontainer/syncthing/cert.age Binary files differ.
diff --git a/secrets/stasicontainer/syncthing/key.age b/secrets/stasicontainer/syncthing/key.age Binary files differ.
diff --git a/secrets/taurus/restic/matrix-synapse.age b/secrets/taurus/restic/matrix-synapse.age Binary files differ.
diff --git a/secrets/taurus/restic/pleroma.age b/secrets/taurus/restic/pleroma.age Binary files differ.
diff --git a/secrets/taurus/syncthing/cert.age b/secrets/taurus/syncthing/cert.age Binary files differ.
diff --git a/secrets/taurus/syncthing/key.age b/secrets/taurus/syncthing/key.age Binary files differ.