Browse Source

Add initial basis for proper MacOS support

tags/v0.57.0
Colin Stubbs 6 years ago
parent
commit
532b306b4e
2 changed files with 8 additions and 0 deletions
  1. +5
    -0
      salt/map.jinja
  2. +3
    -0
      salt/minion.sls

+ 5
- 0
salt/map.jinja View File

@@ -160,6 +160,11 @@ that differ from whats in defaults.yaml
'config_path': 'C:\salt\conf',
'minion_service': 'salt-minion',
},
'MacOS': {
'salt_minion': 'com.saltstack.salt',
'config_path': '/private/etc/salt',
'minion_service': 'com.saltstack.salt.minion',
},
}, merge=salt['grains.filter_by']({
'Ubuntu': {
'pkgrepo': 'deb http://repo.saltstack.com/apt/' +

+ 3
- 0
salt/minion.sls View File

@@ -1,5 +1,6 @@
{% from "salt/map.jinja" import salt_settings with context %}

{% if grains.os != "MacOS" %}
salt-minion:
{% if salt_settings.install_packages %}
pkg.installed:
@@ -83,3 +84,5 @@ remove-default-minion-conf-file:
remove-old-minion-conf-file:
file.absent:
- name: {{ salt_settings.config_path }}/minion.d/_defaults.conf

{% endif %}

Loading…
Cancel
Save