diff options
Diffstat (limited to 'modules/private/websites/tools/mail')
-rw-r--r-- | modules/private/websites/tools/mail/default.nix | 2 | ||||
-rw-r--r-- | modules/private/websites/tools/mail/roundcubemail.nix | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index 7d7904f..7c60ae4 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix | |||
@@ -1,7 +1,7 @@ | |||
1 | { lib, pkgs, config, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | roundcubemail = pkgs.callPackage ./roundcubemail.nix { | 3 | roundcubemail = pkgs.callPackage ./roundcubemail.nix { |
4 | inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins; | 4 | inherit (pkgs.webapps) roundcubemail; |
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 { |
diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix index 6875bae..bb7dee9 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, apacheHttpd }: | 1 | { env, roundcubemail, apacheHttpd }: |
2 | rec { | 2 | rec { |
3 | varDir = "/var/lib/roundcubemail"; | 3 | varDir = "/var/lib/roundcubemail"; |
4 | activationScript = { | 4 | activationScript = { |
@@ -75,8 +75,7 @@ rec { | |||
75 | $config['mime_types'] = '${apacheHttpd}/conf/mime.types'; | 75 | $config['mime_types'] = '${apacheHttpd}/conf/mime.types'; |
76 | ''; | 76 | ''; |
77 | }]; | 77 | }]; |
78 | webRoot = (roundcubemail.override { roundcube_config = "/var/secrets/webapps/tools-roundcube"; }).withPlugins | 78 | webRoot = (roundcubemail.override { roundcube_config = "/var/secrets/webapps/tools-roundcube"; }).withPlugins (p: [ p.automatic_addressbook p.carddav p.contextmenu p.contextmenu_folder p.html5_notifier p.ident_switch p.message_highlight p.thunderbird_labels ]); |
79 | (builtins.attrValues roundcubemail-plugins) (builtins.attrValues roundcubemail-skins); | ||
80 | apache = rec { | 79 | apache = rec { |
81 | user = "wwwrun"; | 80 | user = "wwwrun"; |
82 | group = "wwwrun"; | 81 | group = "wwwrun"; |