commit 3dcdc2d2b054933a5812411c44a11bb4114b309e · pyrox.dev/nixpkgs

-2

nixos/modules/misc/ids.nix

···

       58
       58
        
             #utmp = 29; # unused

     

       59
       59
        
             ddclient = 30;

     

       60
       60
        
             davfs2 = 31;

     

       61
       61
       -
             privoxy = 32;

     

       62
       61
        
             #disnix = 33; # unused

     

       63
       62
        
             osgi = 34;

     

       64
       63
        
             tor = 35;

     
···

       322
       321
        
             utmp = 29;

     

       323
       322
        
             #ddclient = 30; # unused

     

       324
       323
        
             davfs2 = 31;

     

       325
       325
       -
             privoxy = 32;

     

       326
       324
        
             disnix = 33;

     

       327
       325
        
             osgi = 34;

     

       328
       326
        
             tor = 35;

+9 -9

nixos/modules/services/networking/privoxy.nix

···

       6
       6
        
       

     

       7
       7
        
         inherit (pkgs) privoxy;

     

       8
       8
        
       

     

       9
       9
       -
         privoxyUser = "privoxy";

     

       10
       10
       -
       

     

       11
       9
        
         cfg = config.services.privoxy;

     

       12
       10
        
       

     

       13
       11
        
         confFile = pkgs.writeText "privoxy.conf" ''

     
···

       88
       86
        
         ###### implementation

     

       89
       87
        
       

     

       90
       88
        
         config = mkIf cfg.enable {

     

       91
       91
       -
         

     

       92
       92
       -
           users.extraUsers = singleton

     

       93
       93
       -
             { name = privoxyUser;

     

       94
       94
       -
               uid = config.ids.uids.privoxy;

     

       95
       95
       -
               description = "Privoxy daemon user";

     

       96
       96
       -
             };

     

       89
       89
       +
       

     

       90
       90
       +
           users.users.privoxy = {

     

       91
       91
       +
             isSystemUser = true;

     

       92
       92
       +
             home = "/var/empty";

     

       93
       93
       +
             group = "privoxy";

     

       94
       94
       +
           };

     

       95
       95
       +
       

     

       96
       96
       +
           users.groups.privoxy = {};

     

       97
       97
        
       

     

       98
       98
        
           systemd.services.privoxy = {

     

       99
       99
        
             description = "Filtering web proxy";

     

       100
       100
        
             after = [ "network.target" "nss-lookup.target" ];

     

       101
       101
        
             wantedBy = [ "multi-user.target" ];

     

       102
       102
       -
             serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}";

     

       102
       102
       +
             serviceConfig.ExecStart = "${privoxy}/bin/privoxy --no-daemon --user privoxy ${confFile}";

     

       103
       103
        
       

     

       104
       104
        
             serviceConfig.PrivateDevices = true;

     

       105
       105
        
             serviceConfig.PrivateTmp = true;