From d3452fc59b9839846225fd254926c64a9c71f071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 18 Apr 2020 16:10:56 +0200 Subject: Refactor websites --- .../websites/connexionswing/integration.nix | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 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 4f7b72d..b4de4e1 100644 --- a/modules/private/websites/connexionswing/integration.nix +++ b/modules/private/websites/connexionswing/integration.nix @@ -1,15 +1,19 @@ { lib, pkgs, config, ... }: let secrets = config.myEnv.websites.connexionswing.integration; - app = pkgs.webapps.connexionswing.override { environment = secrets.environment; }; + app = pkgs.callPackage ./app { + environment = secrets.environment; + varDir = "/var/lib/connexionswing_integration"; + secretsPath = config.secrets.fullPaths."websites/connexionswing/integration"; + }; cfg = config.myServices.websites.connexionswing.integration; pcfg = config.services.phpApplication; in { options.myServices.websites.connexionswing.integration.enable = lib.mkEnableOption "enable Connexionswing's website in integration"; config = lib.mkIf cfg.enable { - services.duplyBackup.profiles.connexionswing_dev.rootDir = app.varDir; - services.phpApplication.apps.connexionswing_dev = { + services.duplyBackup.profiles.connexionswing_integration.rootDir = app.varDir; + services.phpApplication.apps.connexionswing_integration = { websiteEnv = "integration"; httpdUser = config.services.httpd.Inte.user; httpdGroup = config.services.httpd.Inte.group; @@ -34,16 +38,16 @@ in { "pm.process_idle_timeout" = "60"; }; phpEnv = { - SYMFONY_DEBUG_MODE = "yes"; + SYMFONY_DEBUG_MODE = "\"yes\""; }; phpWatchFiles = [ - config.secrets.fullPaths."webapps/${app.environment}-connexionswing" + config.secrets.fullPaths."websites/connexionswing/integration" ]; }; secrets.keys = [ { - dest = "webapps/${app.environment}-connexionswing"; + dest = "websites/connexionswing/integration"; user = config.services.httpd.Inte.user; group = config.services.httpd.Inte.group; permissions = "0400"; @@ -67,15 +71,15 @@ in { } ]; - services.websites.env.integration.vhostConfs.connexionswing_dev = { - certName = "integration"; + services.websites.env.integration.vhostConfs.connexionswing_integration = { + certName = "integration"; addToCerts = true; hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; - root = pcfg.webappDirs.connexionswing_dev; + root = pcfg.webappDirs.connexionswing_integration; extraConfig = [ '' - SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_dev}|fcgi://localhost" + SetHandler "proxy:unix:${pcfg.phpListenPaths.connexionswing_integration}|fcgi://localhost" @@ -96,7 +100,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted -- cgit v1.2.3