diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-10-14 13:27:30 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2019-02-08 07:08:13 +0000 |
commit | f636bb20169b1ace0c39dc6733369a5d6bd50ab5 (patch) | |
tree | e04f31996a3972c6a5d8a2bef94b60afd5717cb9 /nixos/modules/services/web-apps/tt-rss.nix | |
parent | a8244c680a29a8480094782d0630bab4b28082c1 (diff) | |
download | nixpkgs-f636bb20169b1ace0c39dc6733369a5d6bd50ab5.tar nixpkgs-f636bb20169b1ace0c39dc6733369a5d6bd50ab5.tar.gz nixpkgs-f636bb20169b1ace0c39dc6733369a5d6bd50ab5.tar.bz2 nixpkgs-f636bb20169b1ace0c39dc6733369a5d6bd50ab5.tar.lz nixpkgs-f636bb20169b1ace0c39dc6733369a5d6bd50ab5.tar.xz nixpkgs-f636bb20169b1ace0c39dc6733369a5d6bd50ab5.tar.zst nixpkgs-f636bb20169b1ace0c39dc6733369a5d6bd50ab5.zip |
tt-rss: read listen socket from pool
This allows to use a different socket. The configuration was tested on my server.
Diffstat (limited to 'nixos/modules/services/web-apps/tt-rss.nix')
-rw-r--r-- | nixos/modules/services/web-apps/tt-rss.nix | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 52ce17a3045..e043ce4b581 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -501,21 +501,23 @@ let } ]; - services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") { - "${poolName}" = '' - listen = "${phpfpmSocketName}"; - listen.owner = nginx - listen.group = nginx - listen.mode = 0600 - user = ${cfg.user} - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - catch_workers_output = 1 - ''; + services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { + "${poolName}" = { + listen = "/var/run/phpfpm/${poolName}.sock"; + extraConfig = '' + listen.owner = nginx + listen.group = nginx + listen.mode = 0600 + user = ${cfg.user} + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + catch_workers_output = 1 + ''; + }; }; # NOTE: No configuration is done if not using virtual host @@ -532,7 +534,7 @@ let locations."~ \.php$" = { extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${phpfpmSocketName}; + fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.listen}; fastcgi_index index.php; ''; }; |