set upload limits
This commit is contained in:
parent
ec956c1ca8
commit
757be61f59
6 changed files with 34 additions and 11 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -2,3 +2,5 @@
|
|||
/.reference/
|
||||
/backend/.phpunit.cache/
|
||||
/.postgres/
|
||||
/result
|
||||
/result-*
|
||||
|
|
|
|||
|
|
@ -18,8 +18,12 @@
|
|||
system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
devPhp = pkgs.php;
|
||||
packages = import ./nix/packages { inherit pkgs; };
|
||||
devPhp = pkgs.php.buildEnv {
|
||||
extraConfig = uploadLimits.phpOptions;
|
||||
};
|
||||
packages = import ./nix/packages {
|
||||
inherit pkgs uploadLimits;
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit packages;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ let
|
|||
appDir = "${backendPackage}/share/php/rabbi-gerzi-backend";
|
||||
phpPackage = backendPackage.passthru.php;
|
||||
poolName = "rabbi-gerzi";
|
||||
uploadLimits = import ./upload-limits.nix;
|
||||
storagePath = "${cfg.stateDir}/storage";
|
||||
cachePath = "${cfg.cacheDir}/bootstrap-cache";
|
||||
setupService = "rabbi-gerzi-setup";
|
||||
|
|
@ -239,6 +240,7 @@ in
|
|||
services.phpfpm.pools.${poolName} = {
|
||||
inherit (cfg) user group;
|
||||
inherit phpPackage;
|
||||
phpOptions = uploadLimits.phpOptions;
|
||||
settings = {
|
||||
"catch_workers_output" = true;
|
||||
"clear_env" = "no";
|
||||
|
|
@ -316,6 +318,9 @@ in
|
|||
cfg.backend.nginx
|
||||
{
|
||||
root = "${appDir}/public";
|
||||
extraConfig = ''
|
||||
client_max_body_size ${uploadLimits.nginxClientMaxBodySize};
|
||||
'';
|
||||
locations = {
|
||||
"/" = {
|
||||
index = "index.php";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,19 @@
|
|||
lib,
|
||||
makeWrapper,
|
||||
php,
|
||||
uploadLimits ? import ../upload-limits.nix,
|
||||
}:
|
||||
|
||||
let
|
||||
phpPackage = php.withExtensions (
|
||||
{ enabled, all }:
|
||||
enabled
|
||||
++ [
|
||||
all.pdo_pgsql
|
||||
]
|
||||
);
|
||||
phpPackage = php.buildEnv {
|
||||
extensions =
|
||||
{ enabled, all }:
|
||||
enabled
|
||||
++ [
|
||||
all.pdo_pgsql
|
||||
];
|
||||
extraConfig = uploadLimits.phpOptions;
|
||||
};
|
||||
in
|
||||
phpPackage.buildComposerProject2 (finalAttrs: {
|
||||
pname = "rabbi-gerzi-backend";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
{ pkgs }:
|
||||
{
|
||||
pkgs,
|
||||
uploadLimits ? import ../upload-limits.nix,
|
||||
}:
|
||||
|
||||
rec {
|
||||
backend = pkgs.callPackage ./backend.nix { };
|
||||
backend = pkgs.callPackage ./backend.nix {
|
||||
inherit uploadLimits;
|
||||
};
|
||||
frontend = pkgs.callPackage ./frontend.nix { };
|
||||
default = frontend;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{
|
||||
nginxClientMaxBodySize = "6m";
|
||||
phpUploadLimit = "6M";
|
||||
phpOptions = ''
|
||||
upload_max_filesize = 6M
|
||||
post_max_size = 6M
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue