Quellcode durchsuchen

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 vor 4 Jahren
Ursprung
Commit
daaa04a102
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
1 geänderte Dateien mit 4 neuen und 5 gelöschten Zeilen
  1. +4
    -5
      salt/minion.sls

+ 4
- 5
salt/minion.sls Datei anzeigen

@@ -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 %}

Laden…
Abbrechen
Speichern