commit 99e24590cbfbb1e82681c9a8dbb7d8d0acd6a1c6 · pyrox.dev/nixpkgs

+7 -7
nixos/modules/services/mail/spamassassin.nix
···

       42
       42
        
       

     

       43
       43
        
                 Then you can Use this sieve filter:

     

       44
       44
        
                   require ["fileinto", "reject", "envelope"];

     

       45
       45
       -
                   

     

       45
       45
       +
       

     

       46
       46
        
                   if header :contains "X-Spam-Flag" "YES" {

     

       47
       47
        
                     fileinto "spam";

     

       48
       48
        
                   }

     
···

       67
       67
        
             initPreConf = mkOption {

     

       68
       68
        
               type = types.str;

     

       69
       69
        
               description = "The SpamAssassin init.pre config.";

     

       70
       70
       -
               default = 

     

       71
       71
       -
               ''          

     

       70
       70
       +
               default =

     

       71
       71
       +
               ''

     

       72
       72
        
                 #

     

       73
       73
        
                 # to update this list, run this command in the rules directory:

     

       74
       74
       -
                 # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq     

     

       74
       74
       +
                 # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq

     

       75
       75
        
                 #

     

       76
       76
        
       

     

       77
       77
        
                 #loadplugin Mail::SpamAssassin::Plugin::AccessDB

     
···

       142
       142
        
       

     

       143
       143
        
           systemd.services.sa-update = {

     

       144
       144
        
             script = ''

     

       145
       145
       -
               set +e 

     

       145
       145
       +
               set +e

     

       146
       146
        
               ${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

     

       147
       147
        
       

     

       148
       148
        
               v=$?

     
···

       157
       157
        
             '';

     

       158
       158
        
           };

     

       159
       159
        
       

     

       160
       160
       -
           systemd.timers.sa-update = { 

     

       160
       160
       +
           systemd.timers.sa-update = {

     

       161
       161
        
             description = "sa-update-service";

     

       162
       162
        
             partOf      = [ "sa-update.service" ];

     

       163
       163
        
             wantedBy    = [ "timers.target" ];

     
···

       184
       184
        
               echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'"

     

       185
       185
        
               mkdir -p /var/lib/spamassassin

     

       186
       186
        
               chown spamd:spamd /var/lib/spamassassin -R

     

       187
       187
       -
               set +e 

     

       187
       187
       +
               set +e

     

       188
       188
        
               ${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

     

       189
       189
        
               v=$?

     

       190
       190
        
               set -e