saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

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

Browse Source 
fix(freebsd): command `at` is already present in base system
This commit is contained in:
Imran Iqbal 2020-07-01 05:47:41 +01:00 committed by GitHub
commit daaa04a102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/minion.sls
View File

@ -122,18 +122,17 @@ salt-minion:
- file: remove-old-minion-conf-file - file: remove-old-minion-conf-file
{%- else %} {%- else %}
{% if grains.os != 'MacOS' %} {% if grains.os_family not in ['MacOS', 'FreeBSD'] %}
{# MacOS has 'at' command; but there's no package to install #} {# MacOS and FreeBSD have the 'at' command; but there's no package to install #}
at: at:
pkg.installed: [] pkg.installed:
- require_in: restart-salt-minion
{% endif %} {% endif %}
restart-salt-minion: restart-salt-minion:
cmd.run: cmd.run:
- name: echo salt-call --local service.restart {{ salt_settings.minion_service }} | at now + 1 minute - name: echo salt-call --local service.restart {{ salt_settings.minion_service }} | at now + 1 minute
- order: last - order: last
- require:
- pkg: at
- onchanges: - onchanges:
{%- if salt_settings.install_packages %} {%- if salt_settings.install_packages %}
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %} {%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}