X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Faten%2Fintegration.nix;h=7e12b389caa945a93b936ac4319d007a81e6756d;hp=7aadf58e2380c3676a13ca912fa88f3cf6cec99c;hb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;hpb=4227853a03923e04daf3dd511a4b5a1ab5d527e7 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 = {