commit 00239ce8e9baeef0ea55fd0995a55e0b15a25ac9 · pyrox.dev/nixpkgs

+8 -5

nixos/modules/services/mail/rmilter.nix

···

       5
       5
        
       let

     

       6
       6
        
       

     

       7
       7
        
         rspamdCfg = config.services.rspamd;

     

       8
       8
       +
         postfixCfg = config.services.postfix;

     

       8
       9
        
         cfg = config.services.rmilter;

     

       9
       10
        
       

     

       10
       11
        
         inetSocket = addr: port: "inet:[${toString port}@${addr}]";

     
···

       219
       220
        
                 PermissionsStartOnly = true;

     

       220
       221
        
                 Restart = "always";

     

       221
       222
        
                 RuntimeDirectory = "rmilter";

     

       222
       222
       -
                 RuntimeDirectoryMode = "0755";

     

       223
       223
       +
                 RuntimeDirectoryMode = "0750";

     

       223
       224
        
               };

     

       224
       225
        
       

     

       225
       226
        
             };

     
···

       231
       232
        
                 ListenStream = systemdSocket;

     

       232
       233
        
                 SocketUser = cfg.user;

     

       233
       234
        
                 SocketGroup = cfg.group;

     

       234
       234
       -
                 SocketMode = "0666";

     

       235
       235
       +
                 SocketMode = "0660";

     

       235
       236
        
               };

     

       236
       237
        
             };

     

       237
       238
        
           })

     

       238
       239
        
       

     

       239
       239
       -
           (mkIf (cfg.enable && cfg.postfix.enable) {

     

       240
       240
       +
           (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) {

     

       241
       241
       +
             users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ];

     

       242
       242
       +
           })

     

       240
       243
        
       

     

       244
       244
       +
           (mkIf (cfg.enable && cfg.postfix.enable) {

     

       241
       245
        
             services.postfix.extraConfig = cfg.postfix.configFragment;

     

       242
       242
       -
             users.users.postfix.extraGroups = [ cfg.group ];

     

       243
       243
       -
       

     

       246
       246
       +
             users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ];

     

       244
       247
        
           })

     

       245
       248
        
         ];

     

       246
       249
        
       }

+4 -1

nixos/modules/services/mail/rspamd.nix

···

       53
       53
        
             bindSocket = mkOption {

     

       54
       54
        
               type = types.listOf types.str;

     

       55
       55
        
               default = [

     

       56
       56
       -
                 "/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}"

     

       56
       56
       +
                 "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"

     

       57
       57
        
               ];

     

       58
       58
       +
               defaultText = ''[

     

       59
       59
       +
                 "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"

     

       60
       60
       +
               ]'';

     

       58
       61
        
               description = ''

     

       59
       62
        
                 List of sockets to listen, in format acceptable by rspamd

     

       60
       63
        
               '';