treewide: use configured nginx package

main
Sandro Jäckel 2 years ago
parent 3a98980e79
commit ae66e2d5ec
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
  1. 2
      nixos/modules/services/mail/postfixadmin.nix
  2. 2
      nixos/modules/services/mail/roundcube.nix
  3. 2
      nixos/modules/services/misc/sourcehut/git.nix
  4. 4
      nixos/modules/services/misc/zoneminder.nix
  5. 2
      nixos/modules/services/web-apps/dokuwiki.nix
  6. 2
      nixos/modules/services/web-apps/jirafeau.nix
  7. 2
      nixos/modules/services/web-apps/restya-board.nix
  8. 2
      nixos/modules/services/web-apps/rss-bridge.nix
  9. 2
      nixos/modules/services/web-servers/nginx/gitweb.nix
  10. 2
      nixos/tests/gitolite-fcgiwrap.nix
  11. 2
      nixos/tests/php/fpm.nix

@ -114,7 +114,7 @@ in
location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${fpm.socket};
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf;
}
'';

@ -153,7 +153,7 @@ in
location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${fpm.socket};
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
include ${pkgs.nginx}/conf/fastcgi.conf;
}
'';

@ -207,7 +207,7 @@ in
fastcgi_param PATH_INFO $uri;
fastcgi_param GIT_PROJECT_ROOT $document_root;
fastcgi_read_timeout 500s;
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
gzip off;
}
'';

@ -254,7 +254,7 @@ in {
location /cgi-bin {
gzip off;
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME ${pkg}/libexec/zoneminder/${zms};
fastcgi_param HTTP_PROXY "";
fastcgi_intercept_errors on;
@ -270,7 +270,7 @@ in {
try_files $uri =404;
fastcgi_index index.php;
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_param HTTP_PROXY "";

@ -376,7 +376,7 @@ in
"~ \\.php$" = {
extraConfig = ''
try_files $uri $uri/ /doku.php;
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket};

@ -136,7 +136,7 @@ in
'';
locations = {
"~ \\.php$".extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket};

@ -235,7 +235,7 @@ in
locations."~ \\.php$" = {
tryFiles = "$uri =404";
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_pass unix:${fpm.socket};
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

@ -111,7 +111,7 @@ in
locations."~ ^/index.php(/|$)" = {
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

@ -79,7 +79,7 @@ in
};
locations."${cfg.location}/" = {
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
include ${config.services.nginx.package}/conf/fastcgi_params;
fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile};
fastcgi_pass unix:/run/gitweb/gitweb.sock;
'';

@ -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)(.*)$;

@ -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."/" = {

Loading…
Cancel
Save