diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-24 13:41:07 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-24 13:41:07 +0100 |
commit | 2abb172bacad70f5b7b451df2a1a984bfff4a2da (patch) | |
tree | 09326493af68598c17f4c52b6911e96b92fae832 | |
parent | 73ed4b9052db660572eddcad325f0a6b8e21d234 (diff) | |
download | Nix-2abb172bacad70f5b7b451df2a1a984bfff4a2da.tar.gz Nix-2abb172bacad70f5b7b451df2a1a984bfff4a2da.tar.zst Nix-2abb172bacad70f5b7b451df2a1a984bfff4a2da.zip |
Add imagick for connexionswing
Fixes https://git.immae.eu/mantisbt/view.php?id=108
-rw-r--r-- | virtual/modules/websites/connexionswing/connexionswing.nix | 5 | ||||
-rw-r--r-- | virtual/modules/websites/connexionswing/default.nix | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/virtual/modules/websites/connexionswing/connexionswing.nix b/virtual/modules/websites/connexionswing/connexionswing.nix index ecbbfd5..f394574 100644 --- a/virtual/modules/websites/connexionswing/connexionswing.nix +++ b/virtual/modules/websites/connexionswing/connexionswing.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { pkgs, lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit }: | 1 | { pkgs, lib, writeText, fetchedGitPrivate, stdenv, composerEnv, phpPackages, fetchurl, fetchgit }: |
2 | let | 2 | let |
3 | connexionswing = { config }: rec { | 3 | connexionswing = { config }: rec { |
4 | environment = config.environment; | 4 | environment = config.environment; |
@@ -23,6 +23,9 @@ let | |||
23 | ''; | 23 | ''; |
24 | phpFpm = rec { | 24 | phpFpm = rec { |
25 | socket = "/var/run/phpfpm/connexionswing-${environment}.sock"; | 25 | socket = "/var/run/phpfpm/connexionswing-${environment}.sock"; |
26 | phpConfig = '' | ||
27 | extension=${phpPackages.imagick}/lib/php/extensions/imagick.so | ||
28 | ''; | ||
26 | pool = '' | 29 | pool = '' |
27 | listen = ${socket} | 30 | listen = ${socket} |
28 | user = ${apache.user} | 31 | user = ${apache.user} |
diff --git a/virtual/modules/websites/connexionswing/default.nix b/virtual/modules/websites/connexionswing/default.nix index 2e4dfc7..5ce3525 100644 --- a/virtual/modules/websites/connexionswing/default.nix +++ b/virtual/modules/websites/connexionswing/default.nix | |||
@@ -43,6 +43,7 @@ in { | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; | 45 | services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; |
46 | services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig; | ||
46 | system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; | 47 | system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; |
47 | services.myWebsites.production.modules = connexionswing_prod.apache.modules; | 48 | services.myWebsites.production.modules = connexionswing_prod.apache.modules; |
48 | services.myWebsites.production.vhostConfs.connexionswing = { | 49 | services.myWebsites.production.vhostConfs.connexionswing = { |
@@ -56,6 +57,7 @@ in { | |||
56 | security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null; | 57 | security.acme.certs."eldiron".extraDomains."sandetludo.immae.eu" = null; |
57 | security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null; | 58 | security.acme.certs."eldiron".extraDomains."connexionswing.immae.eu" = null; |
58 | services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; | 59 | services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; |
60 | services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig; | ||
59 | system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript; | 61 | system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript; |
60 | services.myWebsites.integration.modules = connexionswing_dev.apache.modules; | 62 | services.myWebsites.integration.modules = connexionswing_dev.apache.modules; |
61 | services.myWebsites.integration.vhostConfs.connexionswing = { | 63 | services.myWebsites.integration.vhostConfs.connexionswing = { |