From 4675d68bd818e267799acb1ef8015b8f1424b8f6 Mon Sep 17 00:00:00 2001
From: Kevin Bowling <kevin.bowling@kev009.com>
Date: Thu, 2 Oct 2014 00:20:29 -0700
Subject: [PATCH] Initial FreeBSD support

---
 salt/master.sls        | 3 ++-
 salt/minion.sls        | 3 ++-
 salt/package-map.jinja | 6 +++++-
 salt/syndic.sls        | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/salt/master.sls b/salt/master.sls
index e9e8c3f..d4a62f4 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -4,11 +4,12 @@ salt-master:
   pkg.installed:
     - name: {{ pkgs['salt-master'] }}
   file.managed:
-    - name: /etc/salt/master.d/master.conf
+    - name: {{ pkgs.get('config-path', '/etc/salt') }}/master.d/master.conf
     - template: jinja
     - source: salt://salt/files/master
   service.running:
     - enable: True
+    - name: {{ pkgs.get('master-service', 'salt-master') }}
     - watch:
       - pkg: salt-master
       - file: salt-master
diff --git a/salt/minion.sls b/salt/minion.sls
index d6f587f..3c8412b 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -4,11 +4,12 @@ salt-minion:
   pkg.installed:
     - name: {{ pkgs['salt-minion'] }}
   file.managed:
-    - name: /etc/salt/minion.d/minion.conf
+    - name: {{ pkgs.get('config-path', '/etc/salt') }}/minion.d/minion.conf
     - template: jinja
     - source: salt://salt/files/minion
   service.running:
     - enable: True
+    - name: {{ pkgs.get('minion-service', 'salt-minion') }}
     - watch:
       - pkg: salt-minion
       - file: salt-minion
diff --git a/salt/package-map.jinja b/salt/package-map.jinja
index 18aba07..243d12d 100644
--- a/salt/package-map.jinja
+++ b/salt/package-map.jinja
@@ -34,7 +34,11 @@
     'FreeBSD': {'salt-master': 'py27-salt',
                 'salt-minion': 'py27-salt',
                 'salt-syndic': 'py27-salt',
-                'salt-cloud': 'py27-salt'}
+                'salt-cloud': 'py27-salt',
+                'config-path': '/usr/local/etc/salt',
+                'minion-service': 'salt_minion',
+                'master-service': 'salt_master',
+                'syndic-service': 'salt_syndic'}
 } %}
 
 {% if 'package_table' in pillar %}
diff --git a/salt/syndic.sls b/salt/syndic.sls
index a070f76..0804d98 100644
--- a/salt/syndic.sls
+++ b/salt/syndic.sls
@@ -9,7 +9,7 @@ salt-syndic:
   service:
     - running
     - require:
-      - service: salt-master
+      - service: {{ pkgs.get('syndic-service', 'salt-master') }}
     - watch:
       - pkg: salt-master
-      - file: /etc/salt/master
\ No newline at end of file
+      - file: {{ pkgs.get('config-path', '/etc/salt') }}/master