From 5400b9b6f65451d41a9106fae6fc00f97d83f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 25 Mar 2020 11:57:48 +0100 Subject: Upgrade nixos --- .../private/websites/isabelle/aten_integration.nix | 20 +++++----- .../private/websites/isabelle/aten_production.nix | 20 +++++----- modules/private/websites/isabelle/iridologie.nix | 7 ++-- modules/private/websites/isabelle/spip_builder.nix | 45 ++++++++++------------ 4 files changed, 46 insertions(+), 46 deletions(-) (limited to 'modules/private/websites/isabelle') diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix index a2a087c..fb6eda9 100644 --- a/modules/private/websites/isabelle/aten_integration.nix +++ b/modules/private/websites/isabelle/aten_integration.nix @@ -23,15 +23,17 @@ in { "APP_ENV=${app.environment} ./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 - 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 = { + SYMFONY_DEBUG_MODE = "yes"; + }; }; secrets.keys = [{ diff --git a/modules/private/websites/isabelle/aten_production.nix b/modules/private/websites/isabelle/aten_production.nix index 8e33f0f..cf7e4a2 100644 --- a/modules/private/websites/isabelle/aten_production.nix +++ b/modules/private/websites/isabelle/aten_production.nix @@ -24,16 +24,16 @@ in { "APP_ENV=${app.environment} ./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 - pm = dynamic - pm.max_children = 20 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 3 - ''; + phpPool = { + "php_admin_value[upload_max_filesize]" = "20M"; + "php_admin_value[post_max_size]" = "20M"; + #"php_admin_flag[log_errors]" = "on"; + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; + }; }; secrets.keys = [{ diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix index 460bd2a..ffbf259 100644 --- a/modules/private/websites/isabelle/iridologie.nix +++ b/modules/private/websites/isabelle/iridologie.nix @@ -19,8 +19,9 @@ in { systemd.services.phpfpm-iridologie.after = lib.mkAfter iridologie.phpFpm.serviceDeps; systemd.services.phpfpm-iridologie.wants = iridologie.phpFpm.serviceDeps; services.phpfpm.pools.iridologie = { - listen = iridologie.phpFpm.socket; - extraConfig = iridologie.phpFpm.pool; + user = config.services.httpd.Prod.user; + group = config.services.httpd.Prod.group; + settings = iridologie.phpFpm.pool; phpOptions = config.services.phpfpm.phpOptions + '' extension=${pkgs.php}/lib/php/extensions/mysqli.so ''; @@ -39,7 +40,7 @@ in { RewriteCond "%{HTTP_HOST}" "!^iridologie\.icommandeur\.org$" [NC] RewriteRule ^(.+)$ https://iridologie.icommandeur.org$1 [R=302,L] '' - iridologie.apache.vhostConf + (iridologie.apache.vhostConf config.services.phpfpm.pools.iridologie.socket) ]; }; services.websites.env.production.watchPaths = [ diff --git a/modules/private/websites/isabelle/spip_builder.nix b/modules/private/websites/isabelle/spip_builder.nix index 2ab5394..e1130d1 100644 --- a/modules/private/websites/isabelle/spip_builder.nix +++ b/modules/private/websites/isabelle/spip_builder.nix @@ -3,28 +3,25 @@ rec { app = iridologie.override { inherit (config) environment; }; phpFpm = rec { serviceDeps = [ "mysql.service" ]; - socket = "/var/run/phpfpm/iridologie-${app.environment}.sock"; - pool = '' - user = ${apacheUser} - group = ${apacheGroup} - listen.owner = ${apacheUser} - listen.group = ${apacheGroup} - php_admin_value[upload_max_filesize] = 20M - php_admin_value[post_max_size] = 20M - ;php_admin_flag[log_errors] = on - php_admin_value[open_basedir] = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp" - php_admin_value[session.save_path] = "${app.varDir}/phpSessions" - ${if app.environment == "dev" then '' - pm = ondemand - pm.max_children = 5 - pm.process_idle_timeout = 60 - '' else '' - pm = dynamic - pm.max_children = 20 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 3 - ''}''; + pool = { + "listen.owner" = "${apacheUser}"; + "listen.group" = "${apacheGroup}"; + "php_admin_value[upload_max_filesize]" = "20M"; + "php_admin_value[post_max_size]" = "20M"; + #"php_admin_flag[log_errors]" = "on"; + "php_admin_value[open_basedir]" = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp"; + "php_admin_value[session.save_path]" = "${app.varDir}/phpSessions"; + } // (if app.environment == "dev" then { + "pm" = "ondemand"; + "pm.max_children" = "5"; + "pm.process_idle_timeout" = "60"; + } else { + "pm" = "dynamic"; + "pm.max_children" = "20"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "1"; + "pm.max_spare_servers" = "3"; + }); }; keys = [{ dest = "webapps/${app.environment}-iridologie"; @@ -51,13 +48,13 @@ rec { modules = [ "proxy_fcgi" ]; webappName = "iridologie_${app.environment}"; root = "/run/current-system/webapps/${webappName}"; - vhostConf = '' + vhostConf = socket: '' Include /var/secrets/webapps/${app.environment}-iridologie RewriteEngine On - SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" + SetHandler "proxy:unix:${socket}|fcgi://localhost" -- cgit v1.2.3