diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-12 01:45:52 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-12 01:45:52 +0100 |
commit | 912921a74c8c67663048de66c6d11e1ae63dc10e (patch) | |
tree | 512f58351dc72d97ea656a8b2e9b328e901dc65a /virtual/modules/websites | |
parent | 985845405f0ddd6531e4392e899a31179cde70d6 (diff) | |
download | Nix-912921a74c8c67663048de66c6d11e1ae63dc10e.tar.gz Nix-912921a74c8c67663048de66c6d11e1ae63dc10e.tar.zst Nix-912921a74c8c67663048de66c6d11e1ae63dc10e.zip |
Make mysqli a shared extension, and load it where necessary
Diffstat (limited to 'virtual/modules/websites')
-rw-r--r-- | virtual/modules/websites/chloe/default.nix | 6 | ||||
-rw-r--r-- | virtual/modules/websites/default.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/virtual/modules/websites/chloe/default.nix b/virtual/modules/websites/chloe/default.nix index e5c3db7..fb1f602 100644 --- a/virtual/modules/websites/chloe/default.nix +++ b/virtual/modules/websites/chloe/default.nix | |||
@@ -37,6 +37,9 @@ in { | |||
37 | }; | 37 | }; |
38 | 38 | ||
39 | services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool; | 39 | services.myPhpfpm.poolConfigs.chloe_prod = chloe_prod.phpFpm.pool; |
40 | services.myPhpfpm.poolPhpConfigs.chloe_prod = '' | ||
41 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | ||
42 | ''; | ||
40 | system.activationScripts.chloe_prod = chloe_prod.activationScript; | 43 | system.activationScripts.chloe_prod = chloe_prod.activationScript; |
41 | services.myWebsites.production.modules = chloe_prod.apache.modules; | 44 | services.myWebsites.production.modules = chloe_prod.apache.modules; |
42 | services.myWebsites.production.vhostConfs.chloe = { | 45 | services.myWebsites.production.vhostConfs.chloe = { |
@@ -49,6 +52,9 @@ in { | |||
49 | (lib.mkIf cfg.integration.enable { | 52 | (lib.mkIf cfg.integration.enable { |
50 | security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null; | 53 | security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null; |
51 | services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool; | 54 | services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool; |
55 | services.myPhpfpm.poolPhpConfigs.chloe_prod = '' | ||
56 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | ||
57 | ''; | ||
52 | system.activationScripts.chloe_dev = chloe_dev.activationScript; | 58 | system.activationScripts.chloe_dev = chloe_dev.activationScript; |
53 | services.myWebsites.integration.modules = chloe_dev.apache.modules; | 59 | services.myWebsites.integration.modules = chloe_dev.apache.modules; |
54 | services.myWebsites.integration.vhostConfs.chloe = { | 60 | services.myWebsites.integration.vhostConfs.chloe = { |
diff --git a/virtual/modules/websites/default.nix b/virtual/modules/websites/default.nix index 54284e8..a9e62a5 100644 --- a/virtual/modules/websites/default.nix +++ b/virtual/modules/websites/default.nix | |||
@@ -116,7 +116,7 @@ in | |||
116 | }).overrideAttrs(old: rec { | 116 | }).overrideAttrs(old: rec { |
117 | # Didn't manage to build with mysqli + mysql_config connector | 117 | # Didn't manage to build with mysqli + mysql_config connector |
118 | configureFlags = old.configureFlags ++ [ | 118 | configureFlags = old.configureFlags ++ [ |
119 | "--with-mysqli=mysqlnd" | 119 | "--with-mysqli=shared,mysqlnd" |
120 | ]; | 120 | ]; |
121 | # preConfigure = (old.preConfigure or "") + '' | 121 | # preConfigure = (old.preConfigure or "") + '' |
122 | # export CPPFLAGS="$CPPFLAGS -I${pkgs.mariadb}/include/mysql/server"; | 122 | # export CPPFLAGS="$CPPFLAGS -I${pkgs.mariadb}/include/mysql/server"; |