diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-30 15:40:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-30 15:40:56 +0000 |
commit | 6c7ec025032610b8477cfdb614e39c189337089f (patch) | |
tree | 42109e98945edd62a2f9930f8afa10ceab9dcc9d /nixos | |
parent | 3a2336798f9547b2b74d889f03b3e137d7670eec (diff) | |
parent | a962d538068cdf00025e73181d17572492f68008 (diff) | |
download | nixlib-6c7ec025032610b8477cfdb614e39c189337089f.tar nixlib-6c7ec025032610b8477cfdb614e39c189337089f.tar.gz nixlib-6c7ec025032610b8477cfdb614e39c189337089f.tar.bz2 nixlib-6c7ec025032610b8477cfdb614e39c189337089f.tar.lz nixlib-6c7ec025032610b8477cfdb614e39c189337089f.tar.xz nixlib-6c7ec025032610b8477cfdb614e39c189337089f.tar.zst nixlib-6c7ec025032610b8477cfdb614e39c189337089f.zip |
Merge pull request #48499 from aneeshusa/restart-salt-on-config-changes
nixos/salt: restart on config changes
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/admin/salt/master.nix | 3 | ||||
-rw-r--r-- | nixos/modules/services/admin/salt/minion.nix | 21 |
2 files changed, 19 insertions, 5 deletions
diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix index 165580b97837..c6b1b0cc0bd8 100644 --- a/nixos/modules/services/admin/salt/master.nix +++ b/nixos/modules/services/admin/salt/master.nix @@ -53,6 +53,9 @@ in Type = "notify"; NotifyAccess = "all"; }; + restartTriggers = [ + config.environment.etc."salt/master".source + ]; }; }; diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix index 9ecefb32cfa8..c8fa9461a209 100644 --- a/nixos/modules/services/admin/salt/minion.nix +++ b/nixos/modules/services/admin/salt/minion.nix @@ -15,7 +15,6 @@ let # Default is in /etc/salt/pki/minion pki_dir = "/var/lib/salt/pki/minion"; } cfg.configuration; - configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig); in @@ -28,15 +27,24 @@ in default = {}; description = '' Salt minion configuration as Nix attribute set. - See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/> - for details. + See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/> + for details. ''; }; }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ salt ]; + environment = { + # Set this up in /etc/salt/minion so `salt-call`, etc. work. + # The alternatives are + # - passing --config-dir to all salt commands, not just the minion unit, + # - setting aglobal environment variable. + etc."salt/minion".source = pkgs.writeText "minion" ( + builtins.toJSON fullConfig + ); + systemPackages = with pkgs; [ salt ]; + }; systemd.services.salt-minion = { description = "Salt Minion"; wantedBy = [ "multi-user.target" ]; @@ -45,11 +53,14 @@ in utillinux ]; serviceConfig = { - ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}"; + ExecStart = "${pkgs.salt}/bin/salt-minion"; LimitNOFILE = 8192; Type = "notify"; NotifyAccess = "all"; }; + restartTriggers = [ + config.environment.etc."salt/minion".source + ]; }; }; } |