X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpiedsjaloux%2Fintegration.nix;h=76523edd81edbc662e4ac19a86159d981ece5778;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=0a33bc0a095d716910cdcc092e1d957dd7e4ea1e;hpb=9f66adf4372a3b1c859dc053489f727aa360077e;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix index 0a33bc0..76523ed 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; @@ -8,6 +8,7 @@ in { options.myServices.websites.piedsjaloux.integration.enable = lib.mkEnableOption "enable PiedsJaloux's website in integration"; config = lib.mkIf cfg.enable { + services.duplyBackup.profiles.piedsjaloux_dev.rootDir = app.varDir; services.phpApplication.apps.piedsjaloux_dev = { websiteEnv = "integration"; httpdUser = config.services.httpd.Inte.user; @@ -22,16 +23,18 @@ in { "./bin/console --env=${app.environment} cache:clear --no-warmup" ]; phpOpenbasedir = [ "/tmp" ]; - phpPool = '' - php_admin_value[upload_max_filesize] = 20M - php_admin_value[post_max_size] = 20M - ;php_admin_flag[log_errors] = on - env[PATH] = ${lib.makeBinPath [ pkgs.apg pkgs.unzip ]} - pm = ondemand - pm.max_children = 5 - pm.process_idle_timeout = 60 - env[SYMFONY_DEBUG_MODE] = "yes" - ''; + phpPool = { + "php_admin_value[upload_max_filesize]" = "20M"; + "php_admin_value[post_max_size]" = "20M"; + #"php_admin_flag[log_errors]" = "on"; + "pm" = "ondemand"; + "pm.max_children" = "5"; + "pm.process_idle_timeout" = "60"; + }; + phpEnv = { + PATH = lib.makeBinPath [ pkgs.apg pkgs.unzip ]; + SYMFONY_DEBUG_MODE = "yes"; + }; phpWatchFiles = [ config.secrets.fullPaths."webapps/${app.environment}-piedsjaloux" ]; @@ -48,7 +51,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} @@ -65,7 +68,7 @@ in { ]; services.websites.env.integration.vhostConfs.piedsjaloux_dev = { - certName = "eldiron"; + certName = "integration"; addToCerts = true; hosts = [ "piedsjaloux.immae.eu" ]; root = pcfg.webappDirs.piedsjaloux_dev;