movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos(spamassassin): fix trailing whitespace

Browse source
This commit is contained in:
Peter Simons 2017-09-27 14:37:56 +02:00
parent bfab392e6e
commit 99e24590cb
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/services/mail/spamassassin.nix
View file

@ -42,7 +42,7 @@ in
Then you can Use this sieve filter: Then you can Use this sieve filter:
require ["fileinto", "reject", "envelope"]; require ["fileinto", "reject", "envelope"];
if header :contains "X-Spam-Flag" "YES" { if header :contains "X-Spam-Flag" "YES" {
fileinto "spam"; fileinto "spam";
} }
@ -67,11 +67,11 @@ in
initPreConf = mkOption { initPreConf = mkOption {
type = types.str; type = types.str;
description = "The SpamAssassin init.pre config."; description = "The SpamAssassin init.pre config.";
default = default =
'' ''
# #
# to update this list, run this command in the rules directory: # to update this list, run this command in the rules directory:
# grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq
# #
#loadplugin Mail::SpamAssassin::Plugin::AccessDB #loadplugin Mail::SpamAssassin::Plugin::AccessDB
@ -142,7 +142,7 @@ in
systemd.services.sa-update = { systemd.services.sa-update = {
script = '' script = ''
set +e set +e
${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
v=$? v=$?
@ -157,7 +157,7 @@ in
''; '';
}; };
systemd.timers.sa-update = { systemd.timers.sa-update = {
description = "sa-update-service"; description = "sa-update-service";
partOf = [ "sa-update.service" ]; partOf = [ "sa-update.service" ];
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
@ -184,7 +184,7 @@ in
echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'" echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'"
mkdir -p /var/lib/spamassassin mkdir -p /var/lib/spamassassin
chown spamd:spamd /var/lib/spamassassin -R chown spamd:spamd /var/lib/spamassassin -R
set +e set +e
${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
v=$? v=$?
set -e set -e