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

Oops...wrong function name?

This commit is contained in:
niten 2023-07-16 11:50:57 -07:00
parent 48aacb4763
commit bdaa1b4dad
1 changed files with 11 additions and 13 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.envFiles; env_file = [ lemmyCfg.envFile ];
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,7 +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; env_file = [ pictrsCfg.envFile ];
}; };
}; };
postgres = { postgres = {
@ -56,7 +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; env_file = [ postgresCfg.envFile ];
}; };
}; };
}; };
@ -345,25 +345,23 @@ in {
inherit postgresPasswd pictrsApiKey; inherit postgresPasswd pictrsApiKey;
smtpServer = cfg.smtp-server; smtpServer = cfg.smtp-server;
}; };
envFiles = [ (makeEnvFile { RUST_LOG = "warn"; }) ]; envFile = makeEnvFile { RUST_LOG = "warn"; };
}; };
lemmyUiCfg = { lemmyUiCfg = {
image = cfg.docker-images.lemmy-ui; image = cfg.docker-images.lemmy-ui;
envFiles = [ envFile = makeEnvFile {
(mkEnvFile { LEMMY_UI_LEMMY_INTERNAL_HOST = "lemmy:8536";
LEMMY_UI_LEMMY_INTERNAL_HOST = "lemmy:8536"; LEMMY_UI_LEMMY_EXTERNAL_HOST = cfg.hostname;
LEMMY_UI_LEMMY_EXTERNAL_HOST = cfg.hostname; LEMMY_UI_HTTPS = true;
LEMMY_UI_HTTPS = true; };
})
];
}; };
pictrsCfg = { pictrsCfg = {
image = cfg.docker-images.pictrs; image = cfg.docker-images.pictrs;
envFiles = [ host-secrets.lemmy-pictrs-env-file.target-file ]; envFile = host-secrets.lemmy-pictrs-env-file.target-file;
}; };
postgresCfg = { postgresCfg = {
image = cfg.docker-images.postgres; image = cfg.docker-images.postgres;
envFiles = [ hostSecrets.lemmy-postgres-env-file.target-file ]; envFiles = hostSecrets.lemmy-postgres-env-file.target-file;
configFile = postgresCfgFile; configFile = postgresCfgFile;
}; };
}; };