X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpiedsjaloux%2Fintegration.nix;h=5907bc8afe50980ada5139b7bf16647454ff601c;hb=0f71cd76014c2c4eb6756d8c04eb51b3e4452958;hp=8d7cf3af1bb70017c7ac5efbaf85ef787b6b2049;hpb=d2e703c560bc029c3d607058de2935bbf1cb0559;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix index 8d7cf3a..5907bc8 100644 --- a/modules/private/websites/piedsjaloux/integration.nix +++ b/modules/private/websites/piedsjaloux/integration.nix @@ -1,6 +1,6 @@ -{ lib, pkgs, config, myconfig, ... }: +{ lib, pkgs, config, ... }: let - secrets = myconfig.env.websites.piedsjaloux.integration; + secrets = config.myEnv.websites.piedsjaloux.integration; app = pkgs.webapps.piedsjaloux.override { environment = secrets.environment; }; cfg = config.myServices.websites.piedsjaloux.integration; pcfg = config.services.phpApplication; @@ -49,7 +49,7 @@ in { parameters: database_host: ${secrets.mysql.host} database_port: ${secrets.mysql.port} - database_name: ${secrets.mysql.name} + database_name: ${secrets.mysql.database} database_user: ${secrets.mysql.user} database_password: ${secrets.mysql.password} database_server_version: ${pkgs.mariadb.mysqlVersion} @@ -66,7 +66,7 @@ in { ]; services.websites.env.integration.vhostConfs.piedsjaloux_dev = { - certName = "eldiron"; + certName = "integration"; addToCerts = true; hosts = [ "piedsjaloux.immae.eu" ]; root = pcfg.webappDirs.piedsjaloux_dev;