upgrade to 19.09

This commit is contained in:
stubbfel
2019-10-27 19:10:18 +01:00
parent f4a16b2615
commit 8becdbf468
2 changed files with 16 additions and 16 deletions

View File

@@ -42,7 +42,7 @@
# Root
"/" = {
extraConfig = ''
rewrite ^ /index.php$uri;
rewrite ^ /index.php$request_uri;
'';
};
# PHP files
@@ -123,24 +123,24 @@
];
# Option I: PHP-FPM pool for Nextcloud
services.phpfpm.poolConfigs = let
services.phpfpm.pools.nextcloud = let
phpfpmSocketName = "/run/phpfpm/nextcloud.sock";
phpfpmUser = "nextcloud";
phpfpmGroup = "nextcloud";
server = "nginx";
in
{
nextcloud = ''
listen = ${phpfpmSocketName}
listen.owner = ${server}
listen.group = ${server}
user = ${phpfpmUser}
group = ${phpfpmGroup}
pm = ondemand
pm.max_children = 4
pm.process_idle_timeout = 10s
pm.max_requests = 200
'';
settings = {
"listen" = "${phpfpmSocketName}";
"listen.owner" = "${server}";
"listen.group" = "${server}";
"user" = "${phpfpmUser}";
"group" = "${phpfpmGroup}";
"pm" = "ondemand";
"pm.max_children" = 4;
"pm.process_idle_timeout" = "10s";
"pm.max_requests" = 200;
};
};
services.phpfpm.phpOptions = ''

View File

@@ -12,9 +12,9 @@ in
9987 # ts port
];
nixpkgs.config.packageOverrides = pkgs: {
teamspeak_server = unstable.teamspeak_server;
};
# nixpkgs.config.packageOverrides = pkgs: {
# teamspeak_server = unstable.teamspeak_server;
# };
services.teamspeak3= {
enable = true;