From 6baa4450f17e97eb341e3c384b39eddfee557835 Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Mon, 21 Oct 2024 16:02:15 +0200
Subject: [PATCH] feat: fix radicale htpasswd file;

---
 hosts/nuos/configuration.nix  |   3 ++-
 secrets/radicale/htpasswd.age | Bin 0 -> 387 bytes
 secrets/secrets.nix           |   7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 secrets/radicale/htpasswd.age

diff --git a/hosts/nuos/configuration.nix b/hosts/nuos/configuration.nix
index dcfa389..2caab9e 100644
--- a/hosts/nuos/configuration.nix
+++ b/hosts/nuos/configuration.nix
@@ -158,6 +158,7 @@
       "secrets/token-flurry".file = ../../secrets/github/flurry.age;
       "secrets/token-nixconf".file = ../../secrets/github/nixconf.age;
       "secrets/nix-store-key".file = ../../secrets/nix-serve/private.age;
+      "secrets/radicale".file = ../../secrets/radicale/htpasswd.age;
     };
   };
 
@@ -201,7 +202,7 @@
         server.hosts = [ "[::1]:29341" ];
         auth = {
           type = "htpasswd";
-          htpasswd_filename = "/var/radicale_users";
+          htpasswd_filename = config.age.secrets."secrets/radicale".path;
           htpasswd_encryption = "bcrypt";
         };
       };
diff --git a/secrets/radicale/htpasswd.age b/secrets/radicale/htpasswd.age
new file mode 100644
index 0000000000000000000000000000000000000000..e9f2d2ae6a278e336223f422faacf903d3505d8c
GIT binary patch
literal 387
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSHNzMyT3RK8;w2ZWH
z_BAwgFLtXei%bbG%kj&MDmHXYE%hxmDhtdBE!R);40AOwPUb2x)i3sl^2|%kE-}*%
zPtn&lO-?K<EH$V|$<GWaa?3N<&PyuxGczpD^hCF<D8InpC|$uL&8WgB!^7V_t*F%8
z+|)lM%PhU1&?_Ub(8n*uG$1F-ImA4|#WkZU(3dNzLOan-->f_}D95SNBHS;_Our;q
z-#oL#GBGRME6p`PzpB_hr=l{{Jd#USS69J2I3v(IINUQkIkPk+%ReonuqdL)DMQ=T
ztSsC;#kk5l%F;BwDBn}x*_A8vMEN;Qt`|k_2la(J1he8|7tA?Y!?3gNZ?QFh-7O()
z9gf>s6;qr{%HFh;pPcKs>5R0udqw=8Yv)<2Zf~x9v&YM6;lIA3yr|Dfi?juEwNLSU
U72lLwBl@4K@`ZIM_Z#gu0OwMS1poj5

literal 0
HcmV?d00001

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index d49e053..8e797db 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -6,8 +6,9 @@ in
   "restic/env.age".publicKeys = [ noa ];
   "restic/repo.age".publicKeys = [ noa ];
   "restic/password.age".publicKeys = [ noa ];
-  "github/flurry.age".publicKeys = [ nuOS ];
-  "github/nixconf.age".publicKeys = [ nuOS ];
-  "nix-serve/private.age".publicKeys = [ nuOS ];
+  "github/flurry.age".publicKeys = [ noa nuOS ];
+  "github/nixconf.age".publicKeys = [ noa nuOS ];
+  "nix-serve/private.age".publicKeys = [ noa nuOS ];
+  "radicale/htpasswd.age".publicKeys = [ noa nuOS ];
 }