commit bfebc7342e42ebe7a57c9e21b11ab19579189bfd · pyrox.dev/nixpkgs

+1 -1

nixos/modules/programs/venus.nix

···

       165
       165
        
               script = "exec venus-planet ${configFile}";

     

       166
       166
        
               serviceConfig.User = "${cfg.user}";

     

       167
       167
        
               serviceConfig.Group = "${cfg.group}";

     

       168
       168
       -
               environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";

     

       168
       168
       +
               environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";

     

       169
       169
        
               startAt = cfg.dates;

     

       170
       170
        
             };

     

       171
       171

+5 -5

nixos/modules/security/ca.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
       

     

       7
       7
       -
         caBundle = pkgs.runCommand "ca-bundle.crt"

     

       7
       7
       +
         caCertificates = pkgs.runCommand "ca-certificates.crt"

     

       8
       8
        
           { files =

     

       9
       9
        
               config.security.pki.certificateFiles ++

     

       10
       10
        
               [ (builtins.toFile "extra.crt" (concatStringsSep "\n" config.security.pki.certificates)) ];

     
···

       26
       26
        
             description = ''

     

       27
       27
        
               A list of files containing trusted root certificates in PEM

     

       28
       28
        
               format. These are concatenated to form

     

       29
       29
       -
               <filename>/etc/ssl/certs/ca-bundle.crt</filename>, which is

     

       29
       29
       +
               <filename>/etc/ssl/certs/ca-certificates.crt</filename>, which is

     

       30
       30
        
               used by many programs that use OpenSSL, such as

     

       31
       31
        
               <command>curl</command> and <command>git</command>.

     

       32
       32
        
             '';

     
···

       56
       56
        
           security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];

     

       57
       57
        
       

     

       58
       58
        
           # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.

     

       59
       59
       -
           environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;

     

       59
       59
       +
           environment.etc."ssl/certs/ca-certificates.crt".source = caCertificates;

     

       60
       60
        
       

     

       61
       61
        
           # Old NixOS compatibility.

     

       62
       62
       -
           environment.etc."ssl/certs/ca-bundle.crt".source = caBundle;

     

       62
       62
       +
           environment.etc."ssl/certs/ca-bundle.crt".source = caCertificates;

     

       63
       63
        
       

     

       64
       64
        
           # CentOS/Fedora compatibility.

     

       65
       65
       -
           environment.etc."pki/tls/certs/ca-bundle.crt".source = caBundle;

     

       65
       65
       +
           environment.etc."pki/tls/certs/ca-bundle.crt".source = caCertificates;

     

       66
       66
        
       

     

       67
       67
        
           environment.sessionVariables =

     

       68
       68
        
             { SSL_CERT_FILE          = "/etc/ssl/certs/ca-certificates.crt";

+1 -1

nixos/modules/services/misc/nix-daemon.nix

···

       364
       364
        
                 ++ optionals cfg.distributedBuilds [ pkgs.gzip ];

     

       365
       365
        
       

     

       366
       366
        
               environment = cfg.envVars

     

       367
       367
       -
                 // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }

     

       367
       367
       +
                 // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }

     

       368
       368
        
                 // config.networking.proxy.envVars;

     

       369
       369
        
       

     

       370
       370
        
               serviceConfig =

+1 -1

nixos/modules/services/monitoring/dd-agent.nix

···

       183
       183
        
               Restart = "always";

     

       184
       184
        
               RestartSec = 2;

     

       185
       185
        
             };

     

       186
       186
       -
             environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";

     

       186
       186
       +
             environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";

     

       187
       187
        
             restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];

     

       188
       188
        
           };

     

       189
       189

+1 -1

nixos/modules/services/networking/ddclient.nix

···

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

     

       128
       128
        
             after = [ "network.target" ];

     

       129
       129
        
       

     

       130
       130
       -
             environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";

     

       130
       130
       +
             environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";

     

       131
       131
        
             serviceConfig = {

     

       132
       132
        
               # Uncomment this if too many problems occur:

     

       133
       133
        
               # Type = "forking";