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 --- .../websites/connexionswing/integration.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'modules/private/websites/connexionswing/integration.nix') diff --git a/modules/private/websites/connexionswing/integration.nix b/modules/private/websites/connexionswing/integration.nix index 93cda00..fe0e4d9 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix @@ -1,12 +1,8 @@ { lib, pkgs, config, ... }: let secrets = config.myEnv.websites.connexionswing.integration; - app = pkgs.callPackage ./app { - composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; - environment = secrets.environment; - varDir = "/var/lib/connexionswing_integration"; - secretsPath = config.secrets.fullPaths."websites/connexionswing/integration"; - }; + webRoot = "/var/lib/ftp/immae/connexionswing/web"; + varDir = "/var/lib/ftp/immae/connexionswing_var"; cfg = config.myServices.websites.connexionswing.integration; pcfg = config.services.phpApplication; in { @@ -18,16 +14,16 @@ in { websiteEnv = "integration"; httpdUser = config.services.httpd.Inte.user; httpdGroup = config.services.httpd.Inte.group; - inherit (app) webRoot varDir; + inherit webRoot varDir; varDirPaths = { "medias" = "0700"; "uploads" = "0700"; "var" = "0700"; }; - inherit app; + app = "/var/lib/ftp/immae/connexionswing"; serviceDeps = [ "mysql.service" ]; preStartActions = [ - "./bin/console --env=${app.environment} cache:clear --no-warmup" + "./bin/console --env=dev cache:clear --no-warmup" ]; phpOpenbasedir = [ "/tmp" "/run/wrappers/bin/sendmail" ]; phpPool = { @@ -74,20 +70,20 @@ in { certName = "integration"; addToCerts = true; hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; - root = app.webRoot; + root = webRoot; extraConfig = [ '' SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_integration}|fcgi://localhost" - + Options FollowSymLinks AllowOverride None Require all granted - + Options FollowSymLinks AllowOverride None Require all granted @@ -99,7 +95,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted -- cgit v1.2.3