summaryrefslogtreecommitdiffstats
path: root/lass/2configs/websites
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs/websites')
-rw-r--r--lass/2configs/websites/domsen.nix27
-rw-r--r--lass/2configs/websites/util.nix9
2 files changed, 5 insertions, 31 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index a5c51735a..581b37d91 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -21,22 +21,6 @@ let
exec ${pkgs.msmtp}/bin/msmtp --read-envelope-from -C ${msmtprc} "$@"
'';
- restartPhpfpm_o.ubikmedia = pkgs.writeDash "restartPhpfpm_o.ubikmedia.org" ''
- ${pkgs.systemd}/bin/systemctl restart phpfpm-o.ubikmedia.de.service
- '';
-
- restartPhpfpm_o.ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_o.ubikmedia" ''
- /run/wrappers/bin/sudo ${restartPhpfpm_o.ubikmedia}
- '';
-
- restartPhpfpm_ubikmedia = pkgs.writeDash "restartPhpfpm_ubikmedia.org" ''
- ${pkgs.systemd}/bin/systemctl restart phpfpm-ubikmedia.de.service
- '';
-
- restartPhpfpm_ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_ubikmedia" ''
- /run/wrappers/bin/sudo ${restartPhpfpm_ubikmedia}
- '';
-
in {
imports = [
./sqlBackup.nix
@@ -180,16 +164,5 @@ in {
createHome = true;
};
- #sudo restart wrappers
- security.sudo.extraConfig = ''
- domsen ALL= (root) NOPASSWD: ${restartPhpfpm_o.ubikmedia}
- domsen ALL= (root) NOPASSWD: ${restartPhpfpm_ubikmedia}
- '';
-
- krebs.per-user.domsen.packages = [
- restartPhpfpm_ubikmedia_wrapper
- restartPhpfpm_o.ubikmedia_wrapper
- ];
-
}
diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix
index 6d14de731..36ae1a904 100644
--- a/lass/2configs/websites/util.nix
+++ b/lass/2configs/websites/util.nix
@@ -168,6 +168,7 @@ rec {
'';
locations."~ \.php$".extraConfig = ''
fastcgi_pass unix:/srv/http/${domain}/phpfpm.pool;
+ fastcgi_read_timeout 120;
include ${pkgs.nginx}/conf/fastcgi.conf;
'';
#Directives to send expires headers and turn off 404 error logging.
@@ -182,10 +183,10 @@ rec {
user = nginx
group = nginx
pm = dynamic
- pm.max_children = 15
- pm.start_servers = 3
- pm.min_spare_servers = 1
- pm.max_spare_servers = 10
+ pm.max_children = 25
+ pm.start_servers = 5
+ pm.min_spare_servers = 3
+ pm.max_spare_servers = 20
listen.owner = nginx
listen.group = nginx
php_admin_value[error_log] = 'stderr'