aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/florian
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/florian
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/florian')
-rw-r--r--modules/private/websites/florian/app.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 19a88b0..14358d8 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -3,6 +3,7 @@ let
3 adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; }; 3 adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
4 secrets = config.myEnv.websites.tellesflorian.integration; 4 secrets = config.myEnv.websites.tellesflorian.integration;
5 app = pkgs.callPackage ./app { 5 app = pkgs.callPackage ./app {
6 composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
6 environment = secrets.environment; 7 environment = secrets.environment;
7 varDir = "/var/lib/florian_app"; 8 varDir = "/var/lib/florian_app";
8 secretsPath = config.secrets.fullPaths."websites/florian/app"; 9 secretsPath = config.secrets.fullPaths."websites/florian/app";
@@ -42,6 +43,7 @@ in {
42 phpWatchFiles = [ 43 phpWatchFiles = [
43 config.secrets.fullPaths."websites/florian/app" 44 config.secrets.fullPaths."websites/florian/app"
44 ]; 45 ];
46 phpPackage = pkgs.php72;
45 }; 47 };
46 48
47 secrets.keys = [ 49 secrets.keys = [