Unverified Commit 2696c545 authored by Diogo Correia's avatar Diogo Correia
Browse files

nixos/roundcube: fix missing pspell dictionaries during setup 

While the ASPELL_CONF is set for phpfpm-roundcube, it is missing from
the roundcube-setup service, making setup throw a warning.
This commit ensures the environment variables are aligned between the
two.
parent 9458ee16

nixos/modules/services/mail/roundcube.nix

+7 −1
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ let 
  localDB = cfg.database.host == "localhost";

  user = cfg.database.username;

  phpWithPspell = pkgs.php83.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled);



  env = {

    ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell";

  };

in

{

  options.services.roundcube = {
@@ -263,7 +267,7 @@ in 
        "catch_workers_output" = true;

      };

      phpPackage = phpWithPspell;

      phpEnv.ASPELL_CONF = "dict-dir ${pkgs.aspellWithDicts (_: cfg.dicts)}/lib/aspell";

      phpEnv = env;

    };

    systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
@@ -282,6 +286,8 @@ in 
        after = [ "network-online.target" ];

        wantedBy = [ "multi-user.target" ];



        environment = env;



        path = [

          (if localDB then config.services.postgresql.package else pkgs.postgresql)

        ];