2
0

Add initial basis for proper MacOS support

This commit is contained in:
Colin Stubbs 2018-01-06 22:54:57 +10:00
parent 996aa78a8b
commit 532b306b4e
2 changed files with 8 additions and 0 deletions

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/' +

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