Update modules/server/containers/apps/etherpad.nix
This commit is contained in:
@@ -69,14 +69,9 @@ let
|
|||||||
image = pkgs.dockerTools.streamLayeredImage {
|
image = pkgs.dockerTools.streamLayeredImage {
|
||||||
name = "etherpad";
|
name = "etherpad";
|
||||||
tag = etherpad_exe.version;
|
tag = etherpad_exe.version;
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
Entrypoint = [ "${etherpad_exe}/bin/etherpad-lite" ];
|
Entrypoint = [ "${etherpad_exe}/bin/etherpad-lite" ];
|
||||||
ExposedPorts = { "${toString containerCfg.port}/tcp" = {}; };
|
ExposedPorts = { "8080/tcp" = {}; };
|
||||||
Env = [
|
|
||||||
"NODE_ENV=production"
|
|
||||||
];
|
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
@@ -86,12 +81,12 @@ in {
|
|||||||
server = builder.mkContainer {
|
server = builder.mkContainer {
|
||||||
subdomain = containerCfg.subdomain;
|
subdomain = containerCfg.subdomain;
|
||||||
imageStream = image;
|
imageStream = image;
|
||||||
port = containerCfg.port;
|
port = 8080;
|
||||||
ip = containerCfg.ip;
|
ip = containerCfg.ip;
|
||||||
secret = name;
|
secret = name;
|
||||||
extraEnv = {
|
extraEnv = {
|
||||||
TITLE = "Pad";
|
TITLE = "Pad";
|
||||||
PORT = toString containerCfg.port;
|
PORT ="8080";
|
||||||
DB_TYPE = "postgres";
|
DB_TYPE = "postgres";
|
||||||
DB_HOST = builder.host;
|
DB_HOST = builder.host;
|
||||||
DB_NAME = "etherpad_db";
|
DB_NAME = "etherpad_db";
|
||||||
@@ -104,7 +99,7 @@ in {
|
|||||||
SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
|
SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
|
||||||
};
|
};
|
||||||
overrides = {
|
overrides = {
|
||||||
cmd = [ "--settings" "/etc/etherpad/settings.json" "--apikey" "$APIKEY"];
|
cmd = [ "--settings" "/etc/etherpad/settings.json" "--apikey" "./APIKEY.txt" ];
|
||||||
volumes = [
|
volumes = [
|
||||||
"${settings}:/etc/etherpad/settings.json"
|
"${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"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user