From 532b306b4ebbe58d0fd86f26f855631fff457181 Mon Sep 17 00:00:00 2001 From: Colin Stubbs Date: Sat, 6 Jan 2018 22:54:57 +1000 Subject: [PATCH] Add initial basis for proper MacOS support --- salt/map.jinja | 5 +++++ salt/minion.sls | 3 +++ 2 files changed, 8 insertions(+) diff --git a/salt/map.jinja b/salt/map.jinja index fb26230..fd569ba 100644 --- a/salt/map.jinja +++ b/salt/map.jinja @@ -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/' + diff --git a/salt/minion.sls b/salt/minion.sls index cca2cbd..187dc89 100644 --- a/salt/minion.sls +++ b/salt/minion.sls @@ -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 %}