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/florian/app.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'modules/private/websites/florian') diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix index 5e6255c..27810a5 100644 --- a/modules/private/websites/florian/app.nix +++ b/modules/private/websites/florian/app.nix @@ -2,12 +2,7 @@ let adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; }; secrets = config.myEnv.websites.tellesflorian.integration; - app = pkgs.callPackage ./app { - composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; - environment = secrets.environment; - varDir = "/var/lib/florian_app"; - secretsPath = config.secrets.fullPaths."websites/florian/app"; - }; + webRoot = "/var/lib/ftp/immae/florian/web"; cfg = config.myServices.websites.florian.app; pcfg = config.services.phpApplication; in { @@ -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/florian_var"; varDirPaths = { "var" = "0700"; }; - inherit app; + app = "/var/lib/ftp/immae/florian"; serviceDeps = [ "mysql.service" ]; preStartActions = [ - "./bin/console --env=${app.environment} cache:clear --no-warmup" + "./bin/console --env=dev cache:clear --no-warmup" ]; phpOpenbasedir = [ "/tmp" ]; phpPool = { @@ -81,7 +77,7 @@ in { certName = "integration"; addToCerts = true; hosts = [ "app.tellesflorian.com" ]; - root = app.webRoot; + root = webRoot; extraConfig = [ '' @@ -99,7 +95,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted -- cgit v1.2.3