From ab8f306d7c2c49b8116e1af7b355ed2384617ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 12 Dec 2019 00:24:23 +0100 Subject: Add specification for the private config file as a module. --- modules/private/websites/aten/integration.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'modules/private/websites/aten/integration.nix') diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix index 7aadf58..7e12b38 100644 --- a/modules/private/websites/aten/integration.nix +++ b/modules/private/websites/aten/integration.nix @@ -1,6 +1,6 @@ -{ lib, pkgs, config, myconfig, ... }: +{ lib, pkgs, config, ... }: let - secrets = myconfig.env.websites.aten.integration; + secrets = config.myEnv.websites.aten.integration; app = pkgs.webapps.aten.override { environment = secrets.environment; }; cfg = config.myServices.websites.aten.integration; pcfg = config.services.phpApplication; @@ -39,10 +39,15 @@ in { user = config.services.httpd.Inte.user; group = config.services.httpd.Inte.group; permissions = "0400"; - text = '' + text = let + # cf: + # https://secure.php.net/manual/fr/function.parse-url.php + # vendor/doctrine/dbal/lib/Doctrine/DBAL/DriverManager.php#parseDatabaseUrlQuery + psql_url = with secrets.postgresql; "pdo-pgsql://${user}:${password}@invalid:${port}/${database}?host=${socket}"; + in '' SetEnv APP_ENV "${app.environment}" SetEnv APP_SECRET "${secrets.secret}" - SetEnv DATABASE_URL "${secrets.psql_url}" + SetEnv DATABASE_URL "${psql_url}" ''; }]; services.websites.env.integration.vhostConfs.aten_dev = { -- cgit v1.2.3