aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/chloe
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-07 11:58:37 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-07 11:58:37 +0200
commitdcac3ec730176549cd52a9a42db2001dc652c30d (patch)
tree451177d3f3905ae994b0a39806947ad404b292e8 /modules/private/websites/chloe
parent06029fac6a34ef8111ee2f2f07b2118ddb2e1559 (diff)
downloadNix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.gz
Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.zst
Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.zip
Remove overlay that overrides the php version
Diffstat (limited to 'modules/private/websites/chloe')
-rw-r--r--modules/private/websites/chloe/integration.nix3
-rw-r--r--modules/private/websites/chloe/production.nix3
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix
index 6d16a86..e07c5bb 100644
--- a/modules/private/websites/chloe/integration.nix
+++ b/modules/private/websites/chloe/integration.nix
@@ -56,8 +56,9 @@ in {
56 "pm.process_idle_timeout" = "60"; 56 "pm.process_idle_timeout" = "60";
57 }; 57 };
58 phpOptions = config.services.phpfpm.phpOptions + '' 58 phpOptions = config.services.phpfpm.phpOptions + ''
59 extension=${pkgs.php}/lib/php/extensions/mysqli.so 59 extension=${pkgs.php72}/lib/php/extensions/mysqli.so
60 ''; 60 '';
61 phpPackage = pkgs.php72;
61 }; 62 };
62 system.activationScripts.chloe_integration = { 63 system.activationScripts.chloe_integration = {
63 deps = [ "wrappers" ]; 64 deps = [ "wrappers" ];
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix
index 067e8e7..5cfc40c 100644
--- a/modules/private/websites/chloe/production.nix
+++ b/modules/private/websites/chloe/production.nix
@@ -60,8 +60,9 @@ in {
60 "pm.max_spare_servers" = "3"; 60 "pm.max_spare_servers" = "3";
61 }; 61 };
62 phpOptions = config.services.phpfpm.phpOptions + '' 62 phpOptions = config.services.phpfpm.phpOptions + ''
63 extension=${pkgs.php}/lib/php/extensions/mysqli.so 63 extension=${pkgs.php72}/lib/php/extensions/mysqli.so
64 ''; 64 '';
65 phpPackage = pkgs.php72;
65 }; 66 };
66 system.activationScripts.chloe_production = { 67 system.activationScripts.chloe_production = {
67 deps = [ "wrappers" ]; 68 deps = [ "wrappers" ];