Klub-RZ/nur
4
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

nixfmt; better phpfpm settings; working systemd unit

Browse source
This commit is contained in:
sinavir 2022-12-13 21:53:13 +01:00
parent cdfc2b380e
commit 5000b09caa
2 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
modules/web-apps/lychee/default.nix
View file

@ -3,8 +3,7 @@ let
cfg = config.services.lychee;
src = cfg.package;
envConf = cfg.settings;
in
{
in {
options.services.lychee = {
enable = lib.mkEnableOption "Whether to enable lychee";
website = lib.mkOption {
@ -12,9 +11,7 @@ in
default = "localhost";
example = "www.example.com";
};
package = lib.mkOption {
type = lib.types.path;
};
package = lib.mkOption { type = lib.types.path; };
forceSSL = lib.mkOption {
type = lib.types.bool;
default = false;
@ -55,7 +52,7 @@ in
};
DB_LOG_SQL = lib.mkOption {
type = lib.types.str;
default = "\"false\"";
default = ''"false"'';
};
CACHE_DRIVER = lib.mkOption {
type = lib.types.str;
@ -71,15 +68,15 @@ in
};
SECURITY_HEADER_HSTS_ENABLE = lib.mkOption {
type = lib.types.str;
default = "\"false\"";
default = ''"false"'';
};
SESSION_SECURE_COOKIE = lib.mkOption {
type = lib.types.str;
default = "\"false\"";
default = ''"false"'';
};
REDIS_PASSWORD = lib.mkOption {
type = lib.types.str;
default = "\"null\"";
default = ''"null"'';
};
REDIS_PORT = lib.mkOption {
type = lib.types.str;
@ -107,14 +104,16 @@ in
};
extraConfig = ''
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:${config.services.phpfpm.pools."${cfg.website}".socket};
fastcgi_pass unix:${
config.services.phpfpm.pools."${cfg.website}".socket
};
fastcgi_index index.php;
client_max_body_size ${builtins.toString cfg.upload_max_filesize}M;
client_max_body_size ${
builtins.toString cfg.upload_max_filesize
}M;
'';
};
"~ [^/]\.php(/|$)" = {
return = "403";
};
"~ [^/].php(/|$)" = { return = "403"; };
};
extraConfig = ''
index index.php;
@ -128,7 +127,9 @@ in
};
systemd.services."lychee-install" = {
wantedBy = [ "phpfpm-${cfg.website}.service" ];
script = let rsync = pkgs.rsync; in ''
before = [ "phpfpm-${cfg.website}.service" ];
script = let rsync = pkgs.rsync;
in ''
${rsync}/bin/rsync -a --ignore-existing ${src}/ $STATE_DIRECTORY
chmod u+w $STATE_DIRECTORY/
chmod u+w $STATE_DIRECTORY/.env
@ -169,18 +170,10 @@ in
post_max_size = ${builtins.toString cfg.post_max_size}M
'';
settings = {
"pm" = "dynamic";
"pm.max_children" = 75;
"pm.start_servers" = 10;
"pm.min_spare_servers" = 5;
"pm.max_spare_servers" = 20;
"pm.max_requests" = 500;
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
};
phpEnv = {
"PATH" = lib.makeBinPath [ pkgs.ffmpeg ];
} // envConf;
phpEnv = { "PATH" = lib.makeBinPath [ pkgs.ffmpeg ]; } // envConf;
};
users.users.${cfg.user} = {
isSystemUser = lib.mkDefault true;
@ -188,7 +181,6 @@ in
group = lib.mkDefault cfg.user;
};
users.groups.${cfg.user} = { };
networking.firewall.allowedTCPPorts = [ 80 443 ];
};
}

2
modules/web-apps/lychee/test.nix
View file

@ -26,6 +26,6 @@ pkgs.nixosTest ({
};
testScript = ''
start_all()
server.wait_for_unit("default.target")
server.wait_for_unit("phpfpm-localhost.service")
'';
})