Unverified Commit 846674ae authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

nixos/dovecot: hotfix config defaults for sieve-less setups (#509558)

parents fdaf4323 cf431ef6
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ let
    );

  isPre24 = versionOlder cfg.package.version "2.4";

  # HACK: We can not auto-add the default for sieve_script_bin_path unless we have the pigeonhole plugin loaded. Solve this in a better way in the future
  hasPigeonhole = builtins.any (
    pkg: pkg.pname or null == "dovecot-pigeonhole"
  ) config.environment.systemPackages;
in
{
  imports = [
@@ -599,9 +604,9 @@ in
              };

              sieve_script_bin_path = mkOption {
                default = if isPre24 then null else "/tmp/dovecot-%{user|username|lower}";
                default = if isPre24 || !hasPigeonhole then null else "/tmp/dovecot-%{user|username|lower}";
                defaultText = literalExpression ''
                  if isPre24
                  if isPre24 || !hasPigeonhole
                  then null
                  else "/tmp/dovecot-%{user|username|lower}"
                '';