git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68365 from aanderse/zabbix

nixos/zabbixWeb: fix a string reference as well as the phpfpm socket path

commitf16bc2ff5f039ac96c242cfda6e35f0bc6364978 authorMarek Mahut <marek.mahut@gmail.com> dateThu 12 Sep 2019, 15:40 (7 years ago) parent5c8c3d6a0edbc5
1 file changed+2−2
nixos/modules/services/web-apps/zabbix.nix+2−2
nixos/modules/services/web-apps/zabbix.nix+2−2
@@ -179,7 +179,7 @@ in
179179 '' + optionalString (cfg.database.type == "oracle") ''
180180 extension=${pkgs.phpPackages.oci8}/lib/php/extensions/oci8.so
181181 '';
182− phpEnv.ZABBIX_CONFIG = zabbixConfig;
182+ phpEnv.ZABBIX_CONFIG = "${zabbixConfig}";
183183 settings = {
184184 "listen.owner" = config.services.httpd.user;
185185 "listen.group" = config.services.httpd.group;
@@ -197,7 +197,7 @@ in
197197 <Directory "${cfg.package}/share/zabbix">
198198 <FilesMatch "\.php$">
199199 <If "-f %{REQUEST_FILENAME}">
200− SetHandler "proxy:unix:${fpm.listen}|fcgi://localhost/"
200+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
201201 </If>
202202 </FilesMatch>
203203 AllowOverride all