commit 823bb5dd4d9fabf39a81c9374076b8ecdc209a61 · pyrox.dev/nixpkgs

+22 -5
nixos/modules/services/networking/dnscrypt-proxy.nix
···

       7
       7
        
         cfg = config.services.dnscrypt-proxy;

     

       8
       8
        
         uid = config.ids.uids.dnscrypt-proxy;

     

       9
       9
        
         daemonArgs =

     

       10
       10
       -
           [ "--daemonize"

     

       11
       11
       -
             "--user=dnscrypt-proxy"

     

       10
       10
       +
           [ "--user=dnscrypt-proxy"

     

       12
       11
        
             "--local-address=${cfg.localAddress}:${toString cfg.port}"

     

       13
       12
        
             (optionalString cfg.tcpOnly "--tcp-only")

     

       14
       13
        
             "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"

     
···

       114
       113
        
                 ${dnscrypt-proxy}/share/dnscrypt-proxy/** r,

     

       115
       114
        
                 ${pkgs.gcc.cc}/lib/libssp.so.* mr,

     

       116
       115
        
                 ${pkgs.libsodium}/lib/libsodium.so.* mr,

     

       116
       116
       +
                 ${pkgs.systemd}/lib/libsystemd.so.* mr,

     

       117
       117
       +
                 ${pkgs.xz}/lib/liblzma.so.* mr,

     

       118
       118
       +
                 ${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,

     

       119
       119
       +
                 ${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,

     

       117
       120
        
               }

     

       118
       121
        
             '')

     

       119
       122
        
           ];

     
···

       128
       131
        
       

     

       129
       132
        
           ### Service definition

     

       130
       133
        
       

     

       134
       134
       +
           ## derived from upstream dnscrypt-proxy.socket

     

       135
       135
       +
           systemd.sockets.dnscrypt-proxy = {

     

       136
       136
       +
             description = "dnscrypt-proxy listening socket";

     

       137
       137
       +
       

     

       138
       138
       +
             socketConfig = {

     

       139
       139
       +
               ListenStream = "${cfg.localAddress}:${toString cfg.port}";

     

       140
       140
       +
               ListenDatagram = "${cfg.localAddress}:${toString cfg.port}";

     

       141
       141
       +
             };

     

       142
       142
       +
       

     

       143
       143
       +
             wantedBy = [ "sockets.target" ];

     

       144
       144
       +
           };

     

       145
       145
       +
       

     

       146
       146
       +
           # derived from upstream dnscrypt-proxy.service

     

       131
       147
        
           systemd.services.dnscrypt-proxy = {

     

       132
       148
        
             description = "dnscrypt-proxy daemon";

     

       133
       149
        
             after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service";

     

       134
       134
       -
             requires = mkIf apparmorEnabled [ "apparmor.service" ];

     

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

     

       150
       150
       +
             requires = [ "dnscrypt-proxy.socket "] ++ optional apparmorEnabled "apparmor.service";

     

       136
       151
        
             serviceConfig = {

     

       137
       137
       -
               Type = "forking";

     

       152
       152
       +
               Type = "simple";

     

       153
       153
       +
               ## note: NonBlocking is required for socket activation to work

     

       154
       154
       +
               NonBlocking = "true";

     

       138
       155
        
               ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";

     

       139
       156
        
             };

     

       140
       157
        
           };