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: f0cee6b14f19
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9c44eebbbd52
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 2, 2018

  1. nixos/rspamd: Add support for included files 

    By default rspamd will look for multiple files in /etc/rspamd/local.d
and /etc/rspamd/override.d to be included in subsections of the merged
final config for rspamd. Most of the config snippets in the official
rspamd documentation are made to these files and so it makes sense for
NixOS to support them and this is what this commit does.

As part of rspamd 1.8.1 support was added for having custom Lua
rules stored in $LOCAL_CONFDIR/rspamd.local.lua which means that it is
now possible for NixOS to support such rules and so this commit also
adds support for this to the rspamd module.
    @griff
    griff committed Nov 2, 2018
    Copy the full SHA
    0810d63 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2018

  1. Merge pull request #49620 from griff/rspamd-multifile 

    nixos/rspamd: Add support for included files
    @joachifm
    joachifm committed Nov 3, 2018
    Copy the full SHA
    9c44eeb View commit details
    Browse the repository at this point in the history