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/ludivine/integration.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'modules/private/websites/ludivine') diff --git a/modules/private/websites/ludivine/integration.nix b/modules/private/websites/ludivine/integration.nix index 99c9acf..d04295d 100644 --- a/modules/private/websites/ludivine/integration.nix +++ b/modules/private/websites/ludivine/integration.nix @@ -1,14 +1,9 @@ { lib, pkgs, config, ... }: let secrets = config.myEnv.websites.ludivine.integration; - app = pkgs.callPackage ./app { - composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; - environment = secrets.environment; - varDir = "/var/lib/ludivine_integration"; - secretsPath = config.secrets.fullPaths."websites/ludivine/integration"; - }; cfg = config.myServices.websites.ludivine.integration; pcfg = config.services.phpApplication; + webRoot = "/var/lib/ftp/immae/ludivine/web"; in { options.myServices.websites.ludivine.integration.enable = lib.mkEnableOption "enable Ludivine's website in integration"; @@ -18,14 +13,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/ludivine_var"; + app = "/var/lib/ftp/immae/ludivine"; varDirPaths = { "tmp" = "0700"; }; - inherit app; serviceDeps = [ "mysql.service" ]; preStartActions = [ - "./bin/console --env=${app.environment} cache:clear --no-warmup" + "./bin/console --env=dev cache:clear --no-warmup" ]; phpOpenbasedir = [ "/tmp" ]; phpPool = { @@ -90,7 +86,7 @@ in { certName = "integration"; addToCerts = true; hosts = [ "ludivine.immae.eu" ]; - root = app.webRoot; + root = webRoot; extraConfig = [ '' @@ -103,7 +99,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted -- cgit v1.2.3