From 809a35ba85df0a202d26d9ee8cfa474c7eecdf99 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Wed, 1 Feb 2017 20:11:38 +0300
Subject: php-fpm: make use of home directory

Potentially breaking, these options are removed:
pool.user, pool.listen.owner, pool.listen.mode.

Since socket owner cannot be set now,
nginx needs to belong to the appropriate PHP-FPM group.
---
 modules/apps/mediawiki/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'modules/apps/mediawiki')

diff --git a/modules/apps/mediawiki/default.nix b/modules/apps/mediawiki/default.nix
index 2988f07..07dc6e9 100644
--- a/modules/apps/mediawiki/default.nix
+++ b/modules/apps/mediawiki/default.nix
@@ -14,11 +14,10 @@ let
     attrNames elem isAttrs isBool isList isString ;
 
   cfg = config.nixsap.apps.mediawiki;
-  user = config.nixsap.apps.mediawiki.user;
+  user = cfg.user;
   php = cfg.php-fpm.package;
 
   defaultPool = {
-    listen.owner = config.nixsap.apps.nginx.user;
     pm.max_children = 10;
     pm.max_requests = 1000;
     pm.max_spare_servers = 5;
@@ -163,7 +162,7 @@ let
     }
 
     chmod -Rc u=rwX,g=rX,o= '${cfg.localSettings.wgUploadDirectory}'
-    chown -Rc '${user}:${user}' '${cfg.localSettings.wgUploadDirectory}'
+    chown -Rc '${cfg.user}:${cfg.user}' '${cfg.localSettings.wgUploadDirectory}'
   '';
 
   nginx = ''
@@ -295,13 +294,13 @@ in {
   };
 
   config = mkIf cfg.enable {
-    nixsap.deployment.keyrings.${user} = keys;
-    users.users.${config.nixsap.apps.nginx.user}.extraGroups =
-      mkIf cfg.localSettings.wgEnableUploads [ user ];
+    nixsap.deployment.keyrings.${cfg.user} = keys;
+    users.users.${config.nixsap.apps.nginx.user}.extraGroups = [ cfg.user ];
 
     nixsap.apps.php-fpm.mediawiki = mkOverride 0 {
+      inherit (cfg) user;
       inherit (cfg.php-fpm) package;
-      pool = recursiveUpdate defaultPool (cfg.php-fpm.pool // { user = cfg.user ;});
+      pool = recursiveUpdate defaultPool cfg.php-fpm.pool;
     };
 
     nixsap.apps.nginx.conf.http.servers.mediawiki = nginx;
@@ -314,7 +313,7 @@ in {
       serviceConfig = {
         RemainAfterExit = true;
         Type = "oneshot";
-        User = config.nixsap.apps.php-fpm.mediawiki.pool.user;
+        User = cfg.user;
         ExecStart = "${mediawiki-db}/bin/mediawiki-db";
       };
     };
-- 
cgit v1.2.3