X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Feldiron.nix;fp=virtual%2Feldiron.nix;h=c9075cfcd89bdbadf7e583937dcd82a3b7249161;hb=985845405f0ddd6531e4392e899a31179cde70d6;hp=2e4ae1272cfb46265b5b09d7d1ff1635e9f4cee5;hpb=f3d9c61e9becccc9ef25f64e5e639d45ea25650a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 2e4ae12..c9075cf 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -32,6 +32,7 @@
       ./modules/gitweb.nix
       ./modules/databases.nix
       ./modules/websites
+      ./modules/websites/phpfpm
     ];
     services.myGitolite.enable = true;
     services.myGitweb.enable = true;
@@ -73,8 +74,8 @@
         cd ${mypkgs.nextcloud.webRoot}
         NEXTCLOUD_CONFIG_DIR="${mypkgs.nextcloud.webRoot}/config" \
           exec \
-          ${config.services.phpfpm.phpPackage}/bin/php \
-          -c ${config.services.phpfpm.phpPackage}/etc/php.ini \
+          ${pkgs.php}/bin/php \
+          -c ${pkgs.php}/etc/php.ini \
           occ $*
         '';
     in [
@@ -98,23 +99,19 @@
 
     services.ympd = mypkgs.ympd.config // { enable = false; };
 
-    services.phpfpm = {
-      # FIXME: move session files to separate dirs
-      # /!\ phppackage is used in nextcloud configuation
+    services.myPhpfpm = {
+      phpPackage = pkgs.php;
       phpOptions = ''
         session.save_path = "/var/lib/php/sessions"
         session.gc_maxlifetime = 60*60*24*15
         session.cache_expire = 60*24*30
-        ; For nextcloud
-        extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
-        ; For nextcloud
-        extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
-        ; For nextcloud
-        zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
         '';
       extraConfig = ''
         log_level = notice
         '';
+      poolPhpConfigs = {
+        nextcloud = mypkgs.nextcloud.phpFpm.phpConfig;
+      };
       poolConfigs = {
         adminer = mypkgs.adminer.phpFpm.pool;
         nextcloud = mypkgs.nextcloud.phpFpm.pool;