diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-07 11:58:37 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-07 11:58:37 +0200 |
commit | dcac3ec730176549cd52a9a42db2001dc652c30d (patch) | |
tree | 451177d3f3905ae994b0a39806947ad404b292e8 /modules/private/websites/isabelle | |
parent | 06029fac6a34ef8111ee2f2f07b2118ddb2e1559 (diff) | |
download | Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.gz Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.zst Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.zip |
Remove overlay that overrides the php version
Diffstat (limited to 'modules/private/websites/isabelle')
-rw-r--r-- | modules/private/websites/isabelle/aten_integration.nix | 2 | ||||
-rw-r--r-- | modules/private/websites/isabelle/aten_production.nix | 2 | ||||
-rw-r--r-- | modules/private/websites/isabelle/iridologie.nix | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix index 61c35cc..6f8f985 100644 --- a/modules/private/websites/isabelle/aten_integration.nix +++ b/modules/private/websites/isabelle/aten_integration.nix | |||
@@ -2,6 +2,7 @@ | |||
2 | let | 2 | let |
3 | secrets = config.myEnv.websites.isabelle.aten_integration; | 3 | secrets = config.myEnv.websites.isabelle.aten_integration; |
4 | app = pkgs.callPackage ./aten_app { | 4 | app = pkgs.callPackage ./aten_app { |
5 | composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; | ||
5 | environment = secrets.environment; | 6 | environment = secrets.environment; |
6 | varDir = "/var/lib/isabelle_aten_integration"; | 7 | varDir = "/var/lib/isabelle_aten_integration"; |
7 | }; | 8 | }; |
@@ -37,6 +38,7 @@ in { | |||
37 | phpEnv = { | 38 | phpEnv = { |
38 | SYMFONY_DEBUG_MODE = "\"yes\""; | 39 | SYMFONY_DEBUG_MODE = "\"yes\""; |
39 | }; | 40 | }; |
41 | phpPackage = pkgs.php72; | ||
40 | }; | 42 | }; |
41 | 43 | ||
42 | secrets.keys = [{ | 44 | secrets.keys = [{ |
diff --git a/modules/private/websites/isabelle/aten_production.nix b/modules/private/websites/isabelle/aten_production.nix index e34d659..4fa3622 100644 --- a/modules/private/websites/isabelle/aten_production.nix +++ b/modules/private/websites/isabelle/aten_production.nix | |||
@@ -2,6 +2,7 @@ | |||
2 | let | 2 | let |
3 | secrets = config.myEnv.websites.isabelle.aten_production; | 3 | secrets = config.myEnv.websites.isabelle.aten_production; |
4 | app = pkgs.callPackage ./aten_app { | 4 | app = pkgs.callPackage ./aten_app { |
5 | composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; | ||
5 | environment = secrets.environment; | 6 | environment = secrets.environment; |
6 | varDir = "/var/lib/isabelle_aten_production"; | 7 | varDir = "/var/lib/isabelle_aten_production"; |
7 | }; | 8 | }; |
@@ -37,6 +38,7 @@ in { | |||
37 | "pm.min_spare_servers" = "1"; | 38 | "pm.min_spare_servers" = "1"; |
38 | "pm.max_spare_servers" = "3"; | 39 | "pm.max_spare_servers" = "3"; |
39 | }; | 40 | }; |
41 | phpPackage = pkgs.php72; | ||
40 | }; | 42 | }; |
41 | 43 | ||
42 | secrets.keys = [{ | 44 | secrets.keys = [{ |
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix index 560e605..740a3c6 100644 --- a/modules/private/websites/isabelle/iridologie.nix +++ b/modules/private/websites/isabelle/iridologie.nix | |||
@@ -62,8 +62,9 @@ in { | |||
62 | "pm.max_spare_servers" = "3"; | 62 | "pm.max_spare_servers" = "3"; |
63 | }; | 63 | }; |
64 | phpOptions = config.services.phpfpm.phpOptions + '' | 64 | phpOptions = config.services.phpfpm.phpOptions + '' |
65 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 65 | extension=${pkgs.php72}/lib/php/extensions/mysqli.so |
66 | ''; | 66 | ''; |
67 | phpPackage = pkgs.php72; | ||
67 | }; | 68 | }; |
68 | system.activationScripts.isabelle_iridologie = { | 69 | system.activationScripts.isabelle_iridologie = { |
69 | deps = [ "wrappers" ]; | 70 | deps = [ "wrappers" ]; |