yisroelbaum/Rabbi_Gerzi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: yisroelbaum:2763fe8b15e507fd16324455f60e723c81ef3932
Branches Tags
yisroelbaum:master
..
compare: yisroelbaum:3dd868041e4460d46908d54b861abdeab13e21fe
Branches Tags
yisroelbaum:master

No commits in common. "2763fe8b15e507fd16324455f60e723c81ef3932" and "3dd868041e4460d46908d54b861abdeab13e21fe" have entirely different histories.
2763fe8b15 ... 3dd868041e

1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nix/nixos-module.nix
View file

@ -46,6 +46,14 @@ let
SESSION_SECURE_COOKIE = lib.boolToString cfg.backend.cookieSecure; 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"; artisan = "${phpPackage}/bin/php ${appDir}/artisan";
makeDirectoryRule = path: "d ${path} 0750 ${cfg.user} ${cfg.group} - -"; makeDirectoryRule = path: "d ${path} 0750 ${cfg.user} ${cfg.group} - -";
@ -238,6 +246,7 @@ in
services.phpfpm.pools.${poolName} = { services.phpfpm.pools.${poolName} = {
inherit (cfg) user group; inherit (cfg) user group;
inherit phpPackage; inherit phpPackage;
phpEnv = fpmEnvironment;
settings = { settings = {
"catch_workers_output" = true; "catch_workers_output" = true;
"clear_env" = "no"; "clear_env" = "no";
@ -283,7 +292,6 @@ in
systemd.services.${phpfpmService} = { systemd.services.${phpfpmService} = {
after = [ "${setupService}.service" ]; after = [ "${setupService}.service" ];
requires = [ "${setupService}.service" ]; requires = [ "${setupService}.service" ];
environment = appEnvironment;
serviceConfig = { serviceConfig = {
EnvironmentFile = cfg.backend.environmentFile; EnvironmentFile = cfg.backend.environmentFile;
ReadWritePaths = [ ReadWritePaths = [