From cd19d8ac0685beb84d97cb6329e2b693b8c29fc4 Mon Sep 17 00:00:00 2001 From: sora-ext Date: Mon, 11 May 2026 17:48:33 +0200 Subject: [PATCH] Update modules/server/containers/apps/etherpad.nix --- modules/server/containers/apps/etherpad.nix | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/server/containers/apps/etherpad.nix b/modules/server/containers/apps/etherpad.nix index 2d23b19..355cb87 100644 --- a/modules/server/containers/apps/etherpad.nix +++ b/modules/server/containers/apps/etherpad.nix @@ -69,14 +69,9 @@ let image = pkgs.dockerTools.streamLayeredImage { name = "etherpad"; tag = etherpad_exe.version; - config = { Entrypoint = [ "${etherpad_exe}/bin/etherpad-lite" ]; - ExposedPorts = { "${toString containerCfg.port}/tcp" = {}; }; - Env = [ - "NODE_ENV=production" - ]; - + ExposedPorts = { "8080/tcp" = {}; }; }; }; in { @@ -86,12 +81,12 @@ in { server = builder.mkContainer { subdomain = containerCfg.subdomain; imageStream = image; - port = containerCfg.port; + port = 8080; ip = containerCfg.ip; secret = name; extraEnv = { TITLE = "Pad"; - PORT = toString containerCfg.port; + PORT ="8080"; DB_TYPE = "postgres"; DB_HOST = builder.host; DB_NAME = "etherpad_db"; @@ -104,7 +99,7 @@ in { SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background"; }; overrides = { - cmd = [ "--settings" "/etc/etherpad/settings.json" "--apikey" "$APIKEY"]; + cmd = [ "--settings" "/etc/etherpad/settings.json" "--apikey" "./APIKEY.txt" ]; volumes = [ "${settings}:/etc/etherpad/settings.json" ]; @@ -112,4 +107,13 @@ in { }; }; + setup = { + trigger = "server"; + script = pkgs.writeShellScript "setup" '' + # Define the command wrapper + EXEC="${pkgs.podman}/bin/podman --events-backend=none exec --env-file ${config.sops.secrets."CUSTOM".path} etherpad-server sh -c" + $EXEC "echo \"$APIKEY\" > ./APIKEY.txt" + ''; + }; + }