From c4273035cf5876e3ba8ed2c6b492d31c2de290ee Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Fri, 7 Dec 2018 22:57:33 +0300
Subject: Add the "package" option to the nginx app

---
 modules/apps/icingaweb2.nix        |  2 +-
 modules/apps/mediawiki/default.nix |  2 +-
 modules/apps/nginx.nix             | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/apps/icingaweb2.nix b/modules/apps/icingaweb2.nix
index 3881b75..5e988b5 100644
--- a/modules/apps/icingaweb2.nix
+++ b/modules/apps/icingaweb2.nix
@@ -417,7 +417,7 @@ in {
       location ~ ^/index\.php(.*)$ {
         fastcgi_pass unix:${config.nixsap.apps.php-fpm.icingaweb2.pool.listen.socket};
         fastcgi_index index.php;
-        include ${pkgs.nginx}/conf/fastcgi_params;
+        include ${config.nixsap.apps.nginx.package}/conf/fastcgi_params;
         fastcgi_param SCRIPT_FILENAME ${pkgs.icingaweb2}/public/index.php;
         fastcgi_param ICINGAWEB_CONFIGDIR ${cfg.configDir};
         fastcgi_param REMOTE_USER $remote_user;
diff --git a/modules/apps/mediawiki/default.nix b/modules/apps/mediawiki/default.nix
index 07dc6e9..25b4b9a 100644
--- a/modules/apps/mediawiki/default.nix
+++ b/modules/apps/mediawiki/default.nix
@@ -216,7 +216,7 @@ let
 
     location ~ \.php$ {
       fastcgi_pass unix:${config.nixsap.apps.php-fpm.mediawiki.pool.listen.socket};
-      include ${pkgs.nginx}/conf/fastcgi_params;
+      include ${config.nixsap.apps.nginx.package}/conf/fastcgi_params;
       fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     }
   '';
diff --git a/modules/apps/nginx.nix b/modules/apps/nginx.nix
index 0709f71..7965c8d 100644
--- a/modules/apps/nginx.nix
+++ b/modules/apps/nginx.nix
@@ -10,7 +10,7 @@ let
     mkEnableOption mkIf mkOption ;
 
   inherit (lib.types)
-    attrsOf bool either enum int lines nullOr path str submodule ;
+    attrsOf bool either enum int lines nullOr package path str submodule ;
 
 
   cfg = config.nixsap.apps.nginx;
@@ -53,13 +53,18 @@ let
     }
   '';
 
-  exec = "${pkgs.nginx}/bin/nginx -c ${nginx-conf} -p ${cfg.stateDir}";
+  exec = "${cfg.package}/bin/nginx -c ${nginx-conf} -p ${cfg.stateDir}";
 
   enabled = {} != explicit cfg.conf.http.servers;
 
 in {
 
   options.nixsap.apps.nginx = {
+    package = mkOption {
+      description = "Nginx package";
+      type = package;
+      default = pkgs.nginx;
+    };
     user = mkOption {
       description = "User to run as";
       type = str;
@@ -127,7 +132,7 @@ in {
 
   config = {
     nixsap.apps.nginx.conf.http.context = ''
-      include ${pkgs.nginx}/conf/mime.types;
+      include ${cfg.package}/conf/mime.types;
       default_type application/octet-stream;
 
       # This is `combined` format with $remote_user replaced by $http_from.
-- 
cgit v1.2.3