From 41cce84a02652e22ad967c9f31669092eb3e7f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 22 Oct 2021 20:10:54 +0200 Subject: Move devtools to other place --- modules/private/websites/piedsjaloux/integration.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'modules/private/websites/piedsjaloux/integration.nix') diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix index 437b127..64d577e 100644 --- a/modules/private/websites/piedsjaloux/integration.nix +++ b/modules/private/websites/piedsjaloux/integration.nix @@ -1,12 +1,7 @@ { lib, pkgs, config, ... }: let secrets = config.myEnv.websites.piedsjaloux.integration; - app = pkgs.callPackage ./app { - composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; - environment = secrets.environment; - varDir = "/var/lib/piedsjaloux_integration"; - secretsPath = config.secrets.fullPaths."websites/piedsjaloux/integration"; - }; + webRoot = "/var/lib/ftp/immae/piedsjaloux/web"; cfg = config.myServices.websites.piedsjaloux.integration; pcfg = config.services.phpApplication; texlive = pkgs.texlive.combine { inherit (pkgs.texlive) attachfile preprint scheme-small; }; @@ -19,14 +14,15 @@ in { websiteEnv = "integration"; httpdUser = config.services.httpd.Inte.user; httpdGroup = config.services.httpd.Inte.group; - inherit (app) webRoot varDir; + inherit webRoot; + varDir = "/var/lib/ftp/immae/piedsjaloux_var"; varDirPaths = { "tmp" = "0700"; }; - inherit app; + app = "/var/lib/ftp/immae/piedsjaloux"; serviceDeps = [ "mysql.service" ]; preStartActions = [ - "./bin/console --env=${app.environment} cache:clear --no-warmup" + "./bin/console --env=dev cache:clear --no-warmup" ]; phpOpenbasedir = [ "/tmp" ]; phpPool = { @@ -47,7 +43,7 @@ in { SYMFONY_DEBUG_MODE = "\"yes\""; }; phpWatchFiles = [ - app.secretsPath + config.secrets.fullPaths."websites/piedsjaloux/integration" ]; phpPackage = pkgs.php72; }; @@ -80,7 +76,7 @@ in { certName = "integration"; addToCerts = true; hosts = [ "piedsjaloux.immae.eu" ]; - root = app.webRoot; + root = webRoot; extraConfig = [ '' @@ -93,7 +89,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted -- cgit v1.2.3