diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-02-20 16:32:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-20 16:32:09 +0100 |
commit | 5a57844cf69f1f522e013234613484ecc3b0bd28 (patch) | |
tree | 5d5039d2f25bc3e87d07b61f0c37ee16ecff7038 /nixos/modules/services/web-apps | |
parent | 7a27a16e6d3bf942f63727587fbdd00055b1ebf0 (diff) | |
parent | ae66e2d5ec98e70f705382afef21e79483f73fc3 (diff) | |
download | nixpkgs-5a57844cf69f1f522e013234613484ecc3b0bd28.tar nixpkgs-5a57844cf69f1f522e013234613484ecc3b0bd28.tar.gz nixpkgs-5a57844cf69f1f522e013234613484ecc3b0bd28.tar.bz2 nixpkgs-5a57844cf69f1f522e013234613484ecc3b0bd28.tar.lz nixpkgs-5a57844cf69f1f522e013234613484ecc3b0bd28.tar.xz nixpkgs-5a57844cf69f1f522e013234613484ecc3b0bd28.tar.zst nixpkgs-5a57844cf69f1f522e013234613484ecc3b0bd28.zip |
Merge pull request #158592 from SuperSandro2000/nginx-nixos
Diffstat (limited to 'nixos/modules/services/web-apps')
-rw-r--r-- | nixos/modules/services/web-apps/dokuwiki.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/jirafeau.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/restya-board.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/rss-bridge.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 30913ced884..1f8ca742db9 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -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}; diff --git a/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix index a95e2b4f82a..328c61c8e64 100644 --- a/nixos/modules/services/web-apps/jirafeau.nix +++ b/nixos/modules/services/web-apps/jirafeau.nix @@ -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}; diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index fd97ab76a5f..4b36cc8754c 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -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; diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index 456ca00416f..f2b6d955982 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -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; |