Add imagick for connexionswing

Fixes https://git.immae.eu/mantisbt/view.php?id=108

diff --git a/virtual/modules/websites/connexionswing/connexionswing.nix b/virtual/modules/websites/connexionswing/connexionswing.nix
index ecbbfd56b1304eb7bd30b902ab6c861a9cd26a8c..f3945748764e98c1eef1036053913b38609da780 100644 (file)
--- a/virtual/modules/websites/connexionswing/connexionswing.nix
+++ b/virtual/modules/websites/connexionswing/connexionswing.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit }:
+{ pkgs, lib, writeText, fetchedGitPrivate, stdenv, composerEnv, phpPackages, fetchurl, fetchgit }:
 let
   connexionswing = { config }: rec {
     environment = config.environment;
@@ -23,6 +23,9 @@ let
       '';
     phpFpm = rec {
       socket = "/var/run/phpfpm/connexionswing-${environment}.sock";
+      phpConfig = ''
+        extension=${phpPackages.imagick}/lib/php/extensions/imagick.so
+        '';
       pool = ''
         listen = ${socket}
         user = ${apache.user}

diff --git a/virtual/modules/websites/connexionswing/default.nix b/virtual/modules/websites/connexionswing/default.nix
index 2e4dfc7ad9483d17cada504734f8f60899998e16..5ce3525f2e53eff22fca6acb580e3b115d33971b 100644 (file)
--- a/virtual/modules/websites/connexionswing/default.nix
+++ b/virtual/modules/websites/connexionswing/default.nix
@@ -43,6 +43,7 @@ in {
       };
 
       services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool;
+      services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig;
       system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript;
       services.myWebsites.production.modules = connexionswing_prod.apache.modules;
       services.myWebsites.production.vhostConfs.connexionswing = {
@@ -56,6 +57,7 @@ in {
       security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null;
       security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null;
       services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool;
+      services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig;
       system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript;
       services.myWebsites.integration.modules = connexionswing_dev.apache.modules;
       services.myWebsites.integration.vhostConfs.connexionswing = {