public
/
lemmy-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env_file is an array of strings?

This commit is contained in:
niten 2023-07-16 11:32:24 -07:00
parent 9474fbd06a
commit ff1ed91610
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lemmy-docker.nix
View File

@ -27,7 +27,7 @@ let
service = { service = {
image = lemmyCfg.image; image = lemmyCfg.image;
hostname = "lemmy"; hostname = "lemmy";
env_file = lemmyCfg.envFile; env_file = lemmyCfg.envFiles;
volumes = [ "${lemmyCfg.configFile}:/config/config.hjson:ro,Z" ]; volumes = [ "${lemmyCfg.configFile}:/config/config.hjson:ro,Z" ];
depends_on = [ "postgres" "pictrs" ]; depends_on = [ "postgres" "pictrs" ];
}; };
@ -45,6 +45,7 @@ let
hostname = "pictrs"; hostname = "pictrs";
volumes = [ "${stateDirectory}/pictrs:/mnt:Z" ]; volumes = [ "${stateDirectory}/pictrs:/mnt:Z" ];
service.user = "991:991"; service.user = "991:991";
env_file = pictrsCfg.envFiles;
}; };
}; };
postgres = { postgres = {
@ -55,6 +56,7 @@ let
"${stateDirectory}/postgres:/var/lib/postgresql/data:Z" "${stateDirectory}/postgres:/var/lib/postgresql/data:Z"
"${postgresCfg.configFile}:/etc/postgresql.conf" "${postgresCfg.configFile}:/etc/postgresql.conf"
]; ];
env_file = postgresCfg.envFiles;
}; };
}; };
}; };
@ -310,8 +312,8 @@ in {
PICTRS__MEDIA__GIF__MAX_HEIGHT = "256"; PICTRS__MEDIA__GIF__MAX_HEIGHT = "256";
PICTRS__MEDIA__GIF__MAX_AREA = "65536"; PICTRS__MEDIA__GIF__MAX_AREA = "65536";
PICTRS__MEDIA__GIF__MAX_FRAME_COUNT = "400"; PICTRS__MEDIA__GIF__MAX_FRAME_COUNT = "400";
PICTRS__API_KEY = pictrsApiKey;
RUST_LOG = "debug"; RUST_LOG = "debug";
PICTRS__API_KEY = pictrsApiKey;
}; };
target-file = "/run/lemmy/pictrs.env"; target-file = "/run/lemmy/pictrs.env";
}; };
@ -343,23 +345,25 @@ in {
inherit postgresPasswd pictrsApiKey; inherit postgresPasswd pictrsApiKey;
smtpServer = cfg.smtp-server; smtpServer = cfg.smtp-server;
}; };
envFile = makeEnvFile { RUST_LOG = "warn"; }; envFiles = [ (makeEnvFile { RUST_LOG = "warn"; }) ];
}; };
lemmyUiCfg = { lemmyUiCfg = {
image = cfg.docker-images.lemmy-ui; image = cfg.docker-images.lemmy-ui;
envFile = mkEnvFile { envFiles = [
LEMMY_UI_LEMMY_INTERNAL_HOST = "lemmy:8536"; (mkEnvFile {
LEMMY_UI_LEMMY_EXTERNAL_HOST = cfg.hostname; LEMMY_UI_LEMMY_INTERNAL_HOST = "lemmy:8536";
LEMMY_UI_HTTPS = true; LEMMY_UI_LEMMY_EXTERNAL_HOST = cfg.hostname;
}; LEMMY_UI_HTTPS = true;
})
];
}; };
pictrsCfg = { pictrsCfg = {
image = cfg.docker-images.pictrs; image = cfg.docker-images.pictrs;
envFile = host-secrets.lemmy-pictrs-env-file.target-file; envFiles = [ host-secrets.lemmy-pictrs-env-file.target-file ];
}; };
postgresCfg = { postgresCfg = {
image = cfg.docker-images.postgres; image = cfg.docker-images.postgres;
envFile = hostSecrets.lemmy-postgres-env-file.target-file; envFiles = [ hostSecrets.lemmy-postgres-env-file.target-file ];
configFile = postgresCfgFile; configFile = postgresCfgFile;
}; };
}; };