Преглед изворни кода

Merge pull request #473 from sticky-note/fix/at-freebsd

fix(freebsd): command `at` is already present in base system
tags/v1.4.6
Imran Iqbal пре 4 година
родитељ
комит
daaa04a102
No account linked to committer's email address
1 измењених фајлова са 4 додато и 5 уклоњено
  1. +4
    -5
      salt/minion.sls

+ 4
- 5
salt/minion.sls Прегледај датотеку

@@ -122,18 +122,17 @@ salt-minion:
- file: remove-old-minion-conf-file
{%- else %}

{% if grains.os != 'MacOS' %}
{# MacOS has 'at' command; but there's no package to install #}
{% if grains.os_family not in ['MacOS', 'FreeBSD'] %}
{# MacOS and FreeBSD have the 'at' command; but there's no package to install #}
at:
pkg.installed: []
pkg.installed:
- require_in: restart-salt-minion
{% endif %}

restart-salt-minion:
cmd.run:
- name: echo salt-call --local service.restart {{ salt_settings.minion_service }} | at now + 1 minute
- order: last
- require:
- pkg: at
- onchanges:
{%- if salt_settings.install_packages %}
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}

Loading…
Откажи
Сачувај