diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-08 12:13:30 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-02-08 12:13:30 +0100 |
| commit | ae66e2d5ec98e70f705382afef21e79483f73fc3 (patch) | |
| tree | 349316670c4f398aa5d606042b40856ace48adb3 /nixos/tests | |
| parent | 3a98980e79fcdf1430059e3364c65318a6df52e8 (diff) | |
treewide: use configured nginx package
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/gitolite-fcgiwrap.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/php/fpm.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index fc9b214b762ee..38f8d5c883fd5 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -42,7 +42,7 @@ import ./make-test-python.nix ( auth_basic_user_file /etc/gitolite/htpasswd; # common FastCGI parameters are required - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; # strip the CGI program prefix fastcgi_split_path_info ^(/git)(.*)$; diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 31a79bb4dbe39..718a635a6c7c9 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -17,7 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, php, ... }: { locations."~ \\.php$".extraConfig = '' fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket}; fastcgi_index index.php; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; ''; locations."/" = { |