commit 7c3253e519a572f90a907fc56bb6407da004b24c · pyrox.dev/nixpkgs

+2

nixos/modules/module-list.nix

···

       129
       129
        
         ./security/rtkit.nix

     

       130
       130
        
         ./security/wrappers/default.nix

     

       131
       131
        
         ./security/sudo.nix

     

       132
       132
       +
         ./service-managers/docker.nix

     

       133
       133
       +
         ./service-managers/trivial.nix

     

       132
       134
        
         ./services/admin/salt/master.nix

     

       133
       135
        
         ./services/admin/salt/minion.nix

     

       134
       136
        
         ./services/amqp/activemq/default.nix

+29

nixos/modules/service-managers/docker.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.docker-containers;

     

       7
       7
       +
       

     

       8
       8
       +
         containerModule = {

     

       9
       9
       +
           script = mkOption {

     

       10
       10
       +
             type = types.lines;

     

       11
       11
       +
             description = "Shell commands executed as the service's main process.";

     

       12
       12
       +
           };

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         toContainer = name: value: pkgs.dockerTools.buildImage {

     

       16
       16
       +
           inherit name;

     

       17
       17
       +
           config = {

     

       18
       18
       +
             Cmd = [ value.script ];

     

       19
       19
       +
           };

     

       20
       20
       +
         };

     

       21
       21
       +
       in {

     

       22
       22
       +
         options.docker-containers = mkOption {

     

       23
       23
       +
           default = {};

     

       24
       24
       +
           type = with types; attrsOf (types.submodule containerModule);

     

       25
       25
       +
           description = "Definition of docker containers";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         config.system.build.toplevel-docker = lib.mapAttrs toContainer cfg;

     

       29
       29
       +
       }

+35

nixos/modules/service-managers/trivial.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.trivial-services;

     

       7
       7
       +
       

     

       8
       8
       +
         serviceModule.options = {

     

       9
       9
       +
           script = mkOption {

     

       10
       10
       +
             type = types.lines;

     

       11
       11
       +
             description = "Shell commands executed as the service's main process.";

     

       12
       12
       +
           };

     

       13
       13
       +
       

     

       14
       14
       +
           environment = mkOption {

     

       15
       15
       +
             default = {};

     

       16
       16
       +
             type = types.attrs; # FIXME

     

       17
       17
       +
             example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };

     

       18
       18
       +
             description = "Environment variables passed to the service's processes.";

     

       19
       19
       +
           };

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         launcher = name: value: pkgs.writeScript name ''

     

       23
       23
       +
           #!${pkgs.stdenv.shell} -eu

     

       24
       24
       +
       

     

       25
       25
       +
           ${pkgs.writeScript "${name}-entry" value.script}

     

       26
       26
       +
         '';

     

       27
       27
       +
       in {

     

       28
       28
       +
         options.trivial-services = mkOption {

     

       29
       29
       +
           default = {};

     

       30
       30
       +
           type = with types; attrsOf (types.submodule serviceModule);

     

       31
       31
       +
           description = "Definition of trivial services";

     

       32
       32
       +
         };

     

       33
       33
       +
       

     

       34
       34
       +
         config.system.build.toplevel-trivial = lib.mapAttrs launcher cfg;

     

       35
       35
       +
       }

+11 -3

nixos/modules/services/security/hologram-server.nix

···

       23
       23
        
           stats  = cfg.statsAddress;

     

       24
       24
        
           listen = cfg.listenAddress;

     

       25
       25
        
         });

     

       26
       26
       +
       

     

       27
       27
       +
         script = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";

     

       26
       28
        
       in {

     

       27
       29
        
         options = {

     

       28
       30
        
           services.hologram-server = {

     
···

       94
       96
        
             after       = [ "network.target" ];

     

       95
       97
        
             wantedBy    = [ "multi-user.target" ];

     

       96
       98
        
       

     

       97
       97
       -
             serviceConfig = {

     

       98
       98
       -
               ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";

     

       99
       99
       -
             };

     

       99
       99
       +
             inherit script;

     

       100
       100
       +
           };

     

       101
       101
       +
       

     

       102
       102
       +
           docker-containers.hologram-server = {

     

       103
       103
       +
             inherit script;

     

       104
       104
       +
           };

     

       105
       105
       +
       

     

       106
       106
       +
           trivial-services.hologram-server = {

     

       107
       107
       +
             inherit script;

     

       100
       108
        
           };

     

       101
       109
        
         };

     

       102
       110
        
       }