commit 6c7ec025032610b8477cfdb614e39c189337089f · pyrox.dev/nixpkgs

nixos/modules/services/admin/salt/master.nix

···

       53
       53
        
               Type = "notify";

     

       54
       54
        
               NotifyAccess = "all";

     

       55
       55
        
             };

     

       56
       56
       +
             restartTriggers = [

     

       57
       57
       +
               config.environment.etc."salt/master".source

     

       58
       58
       +
             ];

     

       56
       59
        
           };

     

       57
       60
        
         };

     

       58
       61

+16 -5

nixos/modules/services/admin/salt/minion.nix

···

       15
       15
        
           # Default is in /etc/salt/pki/minion

     

       16
       16
        
           pki_dir = "/var/lib/salt/pki/minion";

     

       17
       17
        
         } cfg.configuration;

     

       18
       18
       -
         configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig);

     

       19
       18
        
       

     

       20
       19
        
       in

     

       21
       20
        
       

     
···

       28
       27
        
               default = {};

     

       29
       28
        
               description = ''

     

       30
       29
        
                 Salt minion configuration as Nix attribute set.

     

       31
       31
       -
                 See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>                                                                                                 

     

       32
       32
       -
                 for details.          

     

       30
       30
       +
                 See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>

     

       31
       31
       +
                 for details.

     

       33
       32
        
               '';

     

       34
       33
        
             };

     

       35
       34
        
           };

     

       36
       35
        
         };

     

       37
       36
        
       

     

       38
       37
        
         config = mkIf cfg.enable {

     

       39
       39
       -
           environment.systemPackages = with pkgs; [ salt ];

     

       38
       38
       +
           environment = {

     

       39
       39
       +
             # Set this up in /etc/salt/minion so `salt-call`, etc. work.

     

       40
       40
       +
             # The alternatives are

     

       41
       41
       +
             # - passing --config-dir to all salt commands, not just the minion unit,

     

       42
       42
       +
             # - setting aglobal environment variable.

     

       43
       43
       +
             etc."salt/minion".source = pkgs.writeText "minion" (

     

       44
       44
       +
               builtins.toJSON fullConfig

     

       45
       45
       +
             );

     

       46
       46
       +
             systemPackages = with pkgs; [ salt ];

     

       47
       47
       +
           };

     

       40
       48
        
           systemd.services.salt-minion = {

     

       41
       49
        
             description = "Salt Minion";

     

       42
       50
        
             wantedBy = [ "multi-user.target" ];

     
···

       45
       53
        
               utillinux

     

       46
       54
        
             ];

     

       47
       55
        
             serviceConfig = {

     

       48
       48
       -
               ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}";

     

       56
       56
       +
               ExecStart = "${pkgs.salt}/bin/salt-minion";

     

       49
       57
        
               LimitNOFILE = 8192;

     

       50
       58
        
               Type = "notify";

     

       51
       59
        
               NotifyAccess = "all";

     

       52
       60
        
             };

     

       61
       61
       +
             restartTriggers = [

     

       62
       62
       +
               config.environment.etc."salt/minion".source

     

       63
       63
       +
             ];

     

       53
       64
        
           };

     

       54
       65
        
         };

     

       55
       66
        
       }