Compare commits
No commits in common. "2763fe8b15e507fd16324455f60e723c81ef3932" and "3dd868041e4460d46908d54b861abdeab13e21fe" have entirely different histories.
2763fe8b15
...
3dd868041e
1 changed files with 9 additions and 1 deletions
|
|
@ -46,6 +46,14 @@ let
|
|||
SESSION_SECURE_COOKIE = lib.boolToString cfg.backend.cookieSecure;
|
||||
};
|
||||
|
||||
fpmBaseEnvironment = lib.filterAttrs (
|
||||
environmentName: environmentValue: environmentValue != ""
|
||||
) appEnvironment;
|
||||
|
||||
fpmEnvironment = fpmBaseEnvironment // {
|
||||
APP_KEY = "$APP_KEY";
|
||||
};
|
||||
|
||||
artisan = "${phpPackage}/bin/php ${appDir}/artisan";
|
||||
|
||||
makeDirectoryRule = path: "d ${path} 0750 ${cfg.user} ${cfg.group} - -";
|
||||
|
|
@ -238,6 +246,7 @@ in
|
|||
services.phpfpm.pools.${poolName} = {
|
||||
inherit (cfg) user group;
|
||||
inherit phpPackage;
|
||||
phpEnv = fpmEnvironment;
|
||||
settings = {
|
||||
"catch_workers_output" = true;
|
||||
"clear_env" = "no";
|
||||
|
|
@ -283,7 +292,6 @@ in
|
|||
systemd.services.${phpfpmService} = {
|
||||
after = [ "${setupService}.service" ];
|
||||
requires = [ "${setupService}.service" ];
|
||||
environment = appEnvironment;
|
||||
serviceConfig = {
|
||||
EnvironmentFile = cfg.backend.environmentFile;
|
||||
ReadWritePaths = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue