aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/piedsjaloux
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/piedsjaloux
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/piedsjaloux')
-rw-r--r--modules/private/websites/piedsjaloux/integration.nix2
-rw-r--r--modules/private/websites/piedsjaloux/production.nix2
2 files changed, 4 insertions, 0 deletions
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index d8790cc..dc98900 100644
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -2,6 +2,7 @@
2let 2let
3 secrets = config.myEnv.websites.piedsjaloux.integration; 3 secrets = config.myEnv.websites.piedsjaloux.integration;
4 app = pkgs.callPackage ./app { 4 app = pkgs.callPackage ./app {
5 composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
5 environment = secrets.environment; 6 environment = secrets.environment;
6 varDir = "/var/lib/piedsjaloux_integration"; 7 varDir = "/var/lib/piedsjaloux_integration";
7 secretsPath = config.secrets.fullPaths."websites/piedsjaloux/integration"; 8 secretsPath = config.secrets.fullPaths."websites/piedsjaloux/integration";
@@ -48,6 +49,7 @@ in {
48 phpWatchFiles = [ 49 phpWatchFiles = [
49 app.secretsPath 50 app.secretsPath
50 ]; 51 ];
52 phpPackage = pkgs.php72;
51 }; 53 };
52 54
53 secrets.keys = [ 55 secrets.keys = [
diff --git a/modules/private/websites/piedsjaloux/production.nix b/modules/private/websites/piedsjaloux/production.nix
index 4b2c056..03b9ec5 100644
--- a/modules/private/websites/piedsjaloux/production.nix
+++ b/modules/private/websites/piedsjaloux/production.nix
@@ -2,6 +2,7 @@
2let 2let
3 secrets = config.myEnv.websites.piedsjaloux.production; 3 secrets = config.myEnv.websites.piedsjaloux.production;
4 app = pkgs.callPackage ./app { 4 app = pkgs.callPackage ./app {
5 composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
5 environment = secrets.environment; 6 environment = secrets.environment;
6 varDir = "/var/lib/piedsjaloux_production"; 7 varDir = "/var/lib/piedsjaloux_production";
7 secretsPath = config.secrets.fullPaths."websites/piedsjaloux/production"; 8 secretsPath = config.secrets.fullPaths."websites/piedsjaloux/production";
@@ -50,6 +51,7 @@ in {
50 phpWatchFiles = [ 51 phpWatchFiles = [
51 app.secretsPath 52 app.secretsPath
52 ]; 53 ];
54 phpPackage = pkgs.php72;
53 }; 55 };
54 56
55 secrets.keys = [ 57 secrets.keys = [