Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 43922fe2e339
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8ba51ef5ece8
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 5, 2018

  1. nixos/rspamd: Support multiple workers

    When the workers option for rspamd was originally implemented it was
    based on a flawed understanding of how workers are configured in rspamd.
    This meant that while rspamd supports configuring multiple workers of
    the same type, so that different controller workers could have different
    passwords, the NixOS module did not support this because it would write
    an invalid configuration file if you tried.
    
    Specifically a configuration like the one below:
    
    ```
    workers.controller = {};
    workers.controller2 = {
      type = "controller";
    };
    ```
    
    Would result in a rspamd configuration of:
    
    ```
    worker {
      type = "controller";
      count = 1;
      .include "$CONFDIR/worker-controller.inc"
    }
    worker "controller2" {
      type = "controller";
      count = 1;
    }
    ```
    
    While to get multiple controller workers it should instead be:
    
    ```
    worker "controller" {
      type = "controller";
      count = 1;
      .include "$CONFDIR/worker-controller.inc"
    }
    worker "controller" {
      type = "controller";
      count = 1;
    }
    ```
    griff committed Nov 5, 2018
    Copy the full SHA
    3a4459a View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    46ef075 View commit details
    Browse the repository at this point in the history
  3. nixos/rspamd: Put extraConfig in included files

    The lines stored in `extraConfig` and `worker.<name?>.extraConfig`
    should take precedent over values from included files but in order to do
    this in rspamd UCL they need to be stored in a file that then gets
    included with a high priority. This commit uses the overrides option to
    store the value of the two `extraConfig` options in `extra-config.inc`
    and `worker-<name?>.inc` respectively.
    griff committed Nov 5, 2018
    Copy the full SHA
    fba69f3 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. nixos/rspamd: Add options for postfix integration

    The `rmilter` module has options for configuring `postfix` to use it but
    since that module is deprecated because rspamd now has a builtin worker
    that supports the milter protocol this commit adds similar `postfix`
    integration options directly to the `rspamd` module.
    griff committed Nov 9, 2018
    Copy the full SHA
    e01605b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #49809 from griff/rspamd-workers

    nixos/rspamd: Multiple workers, extraConfig priority & postfix integration
    fpletz committed Nov 9, 2018
    Copy the full SHA
    8ba51ef View commit details
    Browse the repository at this point in the history