diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-07 11:58:37 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-07 11:58:37 +0200 |
commit | dcac3ec730176549cd52a9a42db2001dc652c30d (patch) | |
tree | 451177d3f3905ae994b0a39806947ad404b292e8 /modules/private/websites/tools/mail | |
parent | 06029fac6a34ef8111ee2f2f07b2118ddb2e1559 (diff) | |
download | Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.gz Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.tar.zst Nix-dcac3ec730176549cd52a9a42db2001dc652c30d.zip |
Remove overlay that overrides the php version
Diffstat (limited to 'modules/private/websites/tools/mail')
-rw-r--r-- | modules/private/websites/tools/mail/default.nix | 11 | ||||
-rw-r--r-- | modules/private/websites/tools/mail/rainloop.nix | 4 | ||||
-rw-r--r-- | modules/private/websites/tools/mail/roundcubemail.nix | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index dda2d45..217ef1a 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix | |||
@@ -4,7 +4,9 @@ let | |||
4 | inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins; | 4 | inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins; |
5 | env = config.myEnv.tools.roundcubemail; | 5 | env = config.myEnv.tools.roundcubemail; |
6 | }; | 6 | }; |
7 | rainloop = pkgs.callPackage ./rainloop.nix {}; | 7 | rainloop = pkgs.callPackage ./rainloop.nix { |
8 | rainloop = pkgs.rainloop-community; | ||
9 | }; | ||
8 | cfg = config.myServices.websites.tools.email; | 10 | cfg = config.myServices.websites.tools.email; |
9 | pcfg = config.services.phpfpm.pools; | 11 | pcfg = config.services.phpfpm.pools; |
10 | in | 12 | in |
@@ -60,12 +62,17 @@ in | |||
60 | user = "wwwrun"; | 62 | user = "wwwrun"; |
61 | group = "wwwrun"; | 63 | group = "wwwrun"; |
62 | settings = roundcubemail.phpFpm.pool; | 64 | settings = roundcubemail.phpFpm.pool; |
63 | phpOptions = config.services.phpfpm.phpOptions + roundcubemail.phpFpm.phpConfig; | 65 | phpOptions = config.services.phpfpm.phpOptions + '' |
66 | date.timezone = 'CET' | ||
67 | extension=${pkgs.php72Packages.imagick}/lib/php/extensions/imagick.so | ||
68 | ''; | ||
69 | phpPackage = pkgs.php72; | ||
64 | }; | 70 | }; |
65 | services.phpfpm.pools.rainloop = { | 71 | services.phpfpm.pools.rainloop = { |
66 | user = "wwwrun"; | 72 | user = "wwwrun"; |
67 | group = "wwwrun"; | 73 | group = "wwwrun"; |
68 | settings = rainloop.phpFpm.pool; | 74 | settings = rainloop.phpFpm.pool; |
75 | phpPackage = pkgs.php72; | ||
69 | }; | 76 | }; |
70 | system.activationScripts = { | 77 | system.activationScripts = { |
71 | roundcubemail = roundcubemail.activationScript; | 78 | roundcubemail = roundcubemail.activationScript; |
diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix index 9b1f0c5..21de5eb 100644 --- a/modules/private/websites/tools/mail/rainloop.nix +++ b/modules/private/websites/tools/mail/rainloop.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, writeText, stdenv, fetchurl }: | 1 | { lib, rainloop, writeText, stdenv, fetchurl }: |
2 | rec { | 2 | rec { |
3 | varDir = "/var/lib/rainloop"; | 3 | varDir = "/var/lib/rainloop"; |
4 | activationScript = { | 4 | activationScript = { |
@@ -9,7 +9,7 @@ rec { | |||
9 | install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/data | 9 | install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/data |
10 | ''; | 10 | ''; |
11 | }; | 11 | }; |
12 | webRoot = pkgs.rainloop-community.override { dataPath = "${varDir}/data"; }; | 12 | webRoot = rainloop.override { dataPath = "${varDir}/data"; }; |
13 | apache = rec { | 13 | apache = rec { |
14 | user = "wwwrun"; | 14 | user = "wwwrun"; |
15 | group = "wwwrun"; | 15 | group = "wwwrun"; |
diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix index 0b35d02..6875bae 100644 --- a/modules/private/websites/tools/mail/roundcubemail.nix +++ b/modules/private/websites/tools/mail/roundcubemail.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { env, roundcubemail, roundcubemail-plugins, roundcubemail-skins, phpPackages, apacheHttpd }: | 1 | { env, roundcubemail, roundcubemail-plugins, roundcubemail-skins, apacheHttpd }: |
2 | rec { | 2 | rec { |
3 | varDir = "/var/lib/roundcubemail"; | 3 | varDir = "/var/lib/roundcubemail"; |
4 | activationScript = { | 4 | activationScript = { |
@@ -103,10 +103,6 @@ rec { | |||
103 | [ webRoot "/var/secrets/webapps/tools-roundcube" varDir ] | 103 | [ webRoot "/var/secrets/webapps/tools-roundcube" varDir ] |
104 | ++ webRoot.plugins | 104 | ++ webRoot.plugins |
105 | ++ webRoot.skins); | 105 | ++ webRoot.skins); |
106 | phpConfig = '' | ||
107 | date.timezone = 'CET' | ||
108 | extension=${phpPackages.imagick}/lib/php/extensions/imagick.so | ||
109 | ''; | ||
110 | pool = { | 106 | pool = { |
111 | "listen.owner" = apache.user; | 107 | "listen.owner" = apache.user; |
112 | "listen.group" = apache.group; | 108 | "listen.group" = apache.group; |