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 --- modules/private/websites/tools/mail/default.nix | 15 ++++++---- modules/private/websites/tools/mail/rainloop.nix | 33 ++++++++++------------ .../private/websites/tools/mail/roundcubemail.nix | 33 ++++++++++------------ 3 files changed, 39 insertions(+), 42 deletions(-) (limited to 'modules/private/websites/tools/mail') diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index bb36042..1f7f7bf 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix @@ -6,6 +6,7 @@ let }; rainloop = pkgs.callPackage ./rainloop.nix {}; cfg = config.myServices.websites.tools.email; + pcfg = config.services.phpfpm.pools; in { options.myServices.websites.tools.email = { @@ -34,8 +35,8 @@ in hosts = ["mail.immae.eu"]; root = "/run/current-system/webapps/_mail"; extraConfig = [ - rainloop.apache.vhostConf - roundcubemail.apache.vhostConf + (rainloop.apache.vhostConf pcfg.rainloop.socket) + (roundcubemail.apache.vhostConf pcfg.roundcubemail.socket) '' Require all granted @@ -56,13 +57,15 @@ in }; services.phpfpm.pools.roundcubemail = { - listen = roundcubemail.phpFpm.socket; - extraConfig = roundcubemail.phpFpm.pool; + user = "wwwrun"; + group = "wwwrun"; + settings = roundcubemail.phpFpm.pool; phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig; }; services.phpfpm.pools.rainloop = { - listen = rainloop.phpFpm.socket; - extraConfig = rainloop.phpFpm.pool; + user = "wwwrun"; + group = "wwwrun"; + settings = rainloop.phpFpm.pool; }; system.activationScripts = { roundcubemail = roundcubemail.activationScript; diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix index 2dad46e..9b1f0c5 100644 --- a/modules/private/websites/tools/mail/rainloop.nix +++ b/modules/private/websites/tools/mail/rainloop.nix @@ -16,7 +16,7 @@ rec { modules = [ "proxy_fcgi" ]; webappName = "tools_rainloop"; root = "/run/current-system/webapps/${webappName}"; - vhostConf = '' + vhostConf = socket: '' Alias /rainloop "${root}" DirectoryIndex index.php @@ -25,7 +25,7 @@ rec { Require all granted - SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" + SetHandler "proxy:unix:${socket}|fcgi://localhost" @@ -37,22 +37,19 @@ rec { phpFpm = rec { serviceDeps = [ "postgresql.service" ]; basedir = builtins.concatStringsSep ":" [ webRoot varDir ]; - socket = "/var/run/phpfpm/rainloop.sock"; - pool = '' - user = ${apache.user} - group = ${apache.group} - listen.owner = ${apache.user} - listen.group = ${apache.group} - pm = ondemand - pm.max_children = 60 - pm.process_idle_timeout = 60 + pool = { + "listen.owner" = apache.user; + "listen.group" = apache.group; + "pm" = "ondemand"; + "pm.max_children" = "60"; + "pm.process_idle_timeout" = "60"; - ; Needed to avoid clashes in browser cookies (same domain) - php_value[session.name] = RainloopPHPSESSID - php_admin_value[upload_max_filesize] = 200M - php_admin_value[post_max_size] = 200M - php_admin_value[open_basedir] = "${basedir}:/tmp" - php_admin_value[session.save_path] = "${varDir}/phpSessions" - ''; + # Needed to avoid clashes in browser cookies (same domain) + "php_value[session.name]" = "RainloopPHPSESSID"; + "php_admin_value[upload_max_filesize]" = "200M"; + "php_admin_value[post_max_size]" = "200M"; + "php_admin_value[open_basedir]" = "${basedir}:/tmp"; + "php_admin_value[session.save_path]" = "${varDir}/phpSessions"; + }; }; } diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix index 35de312..0b35d02 100644 --- a/modules/private/websites/tools/mail/roundcubemail.nix +++ b/modules/private/websites/tools/mail/roundcubemail.nix @@ -83,7 +83,7 @@ rec { modules = [ "proxy_fcgi" ]; webappName = "tools_roundcubemail"; root = "/run/current-system/webapps/${webappName}"; - vhostConf = '' + vhostConf = socket: '' Alias /roundcube "${root}" DirectoryIndex index.php @@ -92,7 +92,7 @@ rec { Require all granted - SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" + SetHandler "proxy:unix:${socket}|fcgi://localhost" ''; @@ -107,22 +107,19 @@ rec { date.timezone = 'CET' extension=${phpPackages.imagick}/lib/php/extensions/imagick.so ''; - socket = "/var/run/phpfpm/roundcubemail.sock"; - pool = '' - user = ${apache.user} - group = ${apache.group} - listen.owner = ${apache.user} - listen.group = ${apache.group} - pm = ondemand - pm.max_children = 60 - pm.process_idle_timeout = 60 + pool = { + "listen.owner" = apache.user; + "listen.group" = apache.group; + "pm" = "ondemand"; + "pm.max_children" = "60"; + "pm.process_idle_timeout" = "60"; - ; Needed to avoid clashes in browser cookies (same domain) - php_value[session.name] = RoundcubemailPHPSESSID - php_admin_value[upload_max_filesize] = 200M - php_admin_value[post_max_size] = 200M - php_admin_value[open_basedir] = "${basedir}:${apacheHttpd}/conf/mime.types:/tmp" - php_admin_value[session.save_path] = "${varDir}/phpSessions" - ''; + # Needed to avoid clashes in browser cookies (same domain) + "php_value[session.name]" = "RoundcubemailPHPSESSID"; + "php_admin_value[upload_max_filesize]" = "200M"; + "php_admin_value[post_max_size]" = "200M"; + "php_admin_value[open_basedir]" = "${basedir}:${apacheHttpd}/conf/mime.types:/tmp"; + "php_admin_value[session.save_path]" = "${varDir}/phpSessions"; + }; }; } -- cgit v1.2.3