public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68365 from aanderse/zabbix

Browse Source 
nixos/zabbixWeb: fix a string reference as well as the phpfpm socket path
This commit is contained in:
Marek Mahut 2019-09-12 15:40:34 +02:00 committed by GitHub
commit f16bc2ff5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-apps/zabbix.nix
View File

@ -179,7 +179,7 @@ in
'' + optionalString (cfg.database.type == "oracle") '' '' + optionalString (cfg.database.type == "oracle") ''
extension=${pkgs.phpPackages.oci8}/lib/php/extensions/oci8.so extension=${pkgs.phpPackages.oci8}/lib/php/extensions/oci8.so
''; '';
phpEnv.ZABBIX_CONFIG = zabbixConfig; phpEnv.ZABBIX_CONFIG = "${zabbixConfig}";
settings = { settings = {
"listen.owner" = config.services.httpd.user; "listen.owner" = config.services.httpd.user;
"listen.group" = config.services.httpd.group; "listen.group" = config.services.httpd.group;
@ -197,7 +197,7 @@ in
<Directory "${cfg.package}/share/zabbix"> <Directory "${cfg.package}/share/zabbix">
<FilesMatch "\.php$"> <FilesMatch "\.php$">
<If "-f %{REQUEST_FILENAME}"> <If "-f %{REQUEST_FILENAME}">
SetHandler "proxy:unix:${fpm.listen}|fcgi://localhost/" SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
</If> </If>
</FilesMatch> </FilesMatch>
AllowOverride all AllowOverride all