commit 38ca880612ff37695659b8b56af70553b2193f5f · pyrox.dev/nixpkgs

nixos/modules/rename.nix

···

       14
       14
        
           (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])

     

       15
       15
        
           (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])

     

       16
       16
        
       

     

       17
       17
       +
           (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])

     

       17
       18
        
           (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])

     

       18
       19
        
           (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])

     

       19
       20
        
           (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])

+3 -3

nixos/modules/services/monitoring/cadvisor.nix

···

       14
       14
        
               description = "Whether to enable cadvisor service.";

     

       15
       15
        
             };

     

       16
       16
        
       

     

       17
       17
       -
             host = mkOption {

     

       17
       17
       +
             listenAddress = mkOption {

     

       18
       18
        
               default = "127.0.0.1";

     

       19
       19
        
               type = types.str;

     

       20
       20
        
               description = "Cadvisor listening host";

     
···

       71
       71
        
             after = [ "network.target" "docker.service" "influxdb.service" ];

     

       72
       72
        
       

     

       73
       73
        
             postStart = mkBefore ''

     

       74
       74
       -
               until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do

     

       74
       74
       +
               until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do

     

       75
       75
        
                 sleep 1;

     

       76
       76
        
               done

     

       77
       77
        
             '';

     
···

       79
       79
        
             serviceConfig = {

     

       80
       80
        
               ExecStart = ''${pkgs.cadvisor}/bin/cadvisor \

     

       81
       81
        
                 -logtostderr=true \

     

       82
       82
       -
                 -listen_ip=${cfg.host} \

     

       82
       82
       +
                 -listen_ip=${cfg.listenAddress} \

     

       83
       83
        
                 -port=${toString cfg.port} \

     

       84
       84
        
                 ${optionalString (cfg.storageDriver != null) ''

     

       85
       85
        
                   -storage_driver ${cfg.storageDriver} \