new stuff
This commit is contained in:
@@ -2,9 +2,7 @@
|
||||
let
|
||||
serverCfg = config.syscfg.server;
|
||||
ethercalc_exe = pkgs.ethercalc;
|
||||
settings = pkgs.writeText"settings.json" (builtins.toJSON {
|
||||
title= "\${TITLE:Ethercalc}";
|
||||
});
|
||||
|
||||
image = pkgs.dockerTools.streamLayeredImage {
|
||||
name = "ethercalc";
|
||||
tag = ethercalc_exe.version;
|
||||
@@ -15,7 +13,10 @@ let
|
||||
};
|
||||
};
|
||||
in {
|
||||
paths = [];
|
||||
paths = [{
|
||||
path="${serverCfg.dataPath}/etherpad/";
|
||||
mode = "0666";
|
||||
}];
|
||||
|
||||
containers = {
|
||||
server = builder.mkContainer {
|
||||
@@ -25,33 +26,13 @@ in {
|
||||
ip = containerCfg.ip;
|
||||
secret = name;
|
||||
extraEnv = {
|
||||
TITLE = "Calc";
|
||||
PORT = "8080";
|
||||
DB_TYPE = "postgres";
|
||||
DB_HOST = builder.host;
|
||||
DB_NAME = "ethercalc_db";
|
||||
DB_USER = "ethercalc_user";
|
||||
DB_CHARSET = "utf8mb4";
|
||||
TRUST_PROXY = "true";
|
||||
DEFAULT_CALC_TEXT = "";
|
||||
SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
|
||||
ETHERCALC_PORT = "8080";
|
||||
};
|
||||
overrides = {
|
||||
cmd = [ "--settings" "/etc/ethercalc/settings.json" "--apikey" "./APIKEY.txt" ];
|
||||
volumes = [
|
||||
"${settings}:/etc/ethercalc/settings.json"
|
||||
"${serverCfg.dataPath}/ethercalc:/data"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
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} ethercalc-server sh -c"
|
||||
$EXEC "echo \"$APIKEY\" > ./APIKEY.txt"
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user