From b3eb1de9e60b83639e90e26d1cf97a5e4e2544a6 Mon Sep 17 00:00:00 2001 From: soraefir Date: Mon, 11 May 2026 22:02:16 +0200 Subject: [PATCH] fix --- modules/server/containers/apps/etherpad.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/server/containers/apps/etherpad.nix b/modules/server/containers/apps/etherpad.nix index 542e08d..9136256 100644 --- a/modules/server/containers/apps/etherpad.nix +++ b/modules/server/containers/apps/etherpad.nix @@ -76,7 +76,10 @@ let }; }; in { - paths = []; + paths = [{ + path="${serverCfg.configPath}/etherpad/"; + mode = "0444"; + }]; containers = { server = builder.mkContainer { @@ -100,9 +103,10 @@ in { SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background"; }; overrides = { - cmd = [ "--settings" "/etc/etherpad/settings.json" "--apikey" "/etc/etherpad/APIKEY.txt" ]; + cmd = [ "--settings" "/etc/etherpad/settings.json" "--apikey" "/etc/etherpad/cfg/APIKEY.txt" ]; volumes = [ "${settings}:/etc/etherpad/settings.json" + "${serverCfg.configPath}/etherpad/:/etc/etherpad/cfg:ro" ]; }; }; @@ -110,10 +114,9 @@ in { setup = { trigger = "server"; + envFile = config.sops.secrets."ETHERPAD".path; script = pkgs.writeShellScript "setup" '' - # Define the command wrapper - EXEC="${pkgs.podman}/bin/podman --events-backend=none exec etherpad-server sh -c" - $EXEC "echo \"\$APIKEY\" > /etc/etherpad/APIKEY.txt" + echo \"\$APIKEY\" > ${serverCfg.configPath}/etherpad/cfg/APIKEY.txt ''; };