From 6ec31374cb8718434526d277e0692b490d1b3bbc Mon Sep 17 00:00:00 2001
From: Niels Abspoel <aboe76@gmail.com>
Date: Tue, 9 Jun 2015 23:05:49 +0200
Subject: [PATCH] Remove hardcoded paths with {{ slspath }} variable

---
 salt/cloud.sls               | 2 +-
 salt/master.sls              | 2 +-
 salt/minion.sls              | 2 +-
 salt/pkgrepo/debian/init.sls | 4 ++--
 salt/ssh.sls                 | 2 +-
 salt/standalone.sls          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/salt/cloud.sls b/salt/cloud.sls
index 13bd5c0..251f07e 100644
--- a/salt/cloud.sls
+++ b/salt/cloud.sls
@@ -37,7 +37,7 @@ salt-cloud:
 cloud-cert-{{ cert }}-pem:
   file.managed:
     - name: /etc/salt/pki/cloud/{{ cert }}.pem
-    - source: salt://salt/files/key
+    - source: salt://{{ slspath }}/files/key
     - template: jinja
     - user: root
     - group: root
diff --git a/salt/master.sls b/salt/master.sls
index 234ffca..1e29e23 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -8,7 +8,7 @@ salt-master:
   file.recurse:
     - name: {{ salt_settings.config_path }}/master.d
     - template: jinja
-    - source: salt://salt/files/master.d
+    - source: salt://{{ slspath }}/files/master.d
     - clean: {{ salt_settings.clean_config_d_dir }}
     - exclude_pat: _*
   service.running:
diff --git a/salt/minion.sls b/salt/minion.sls
index 7f0cd52..f682a62 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -8,7 +8,7 @@ salt-minion:
   file.recurse:
     - name: {{ salt_settings.config_path }}/minion.d
     - template: jinja
-    - source: salt://salt/files/minion.d
+    - source: salt://{{ slspath }}/files/minion.d
     - clean: {{ salt_settings.clean_config_d_dir }}
     - exclude_pat: _*
     - context:
diff --git a/salt/pkgrepo/debian/init.sls b/salt/pkgrepo/debian/init.sls
index ffe7165..56ae83d 100644
--- a/salt/pkgrepo/debian/init.sls
+++ b/salt/pkgrepo/debian/init.sls
@@ -1,7 +1,7 @@
 saltstack-apt-key:
   file.managed:
     - name: /etc/apt/trusted.gpg.d/saltstack.gpg
-    - source: salt://salt/pkgrepo/debian/saltstack.gpg
+    - source: salt://{{ slspath }}/saltstack.gpg
     - user: root
     - group: root
     - mode: 644
@@ -9,7 +9,7 @@ saltstack-apt-key:
 saltstack-pkgrepo:
   file.managed:
     - name: /etc/apt/sources.list.d/saltstack.list
-    - source: salt://salt/pkgrepo/debian/sources.list
+    - source: salt://{{ slspath }}/sources.list
     - user: root
     - group: root
     - mode: 644
diff --git a/salt/ssh.sls b/salt/ssh.sls
index 5129581..fad6463 100644
--- a/salt/ssh.sls
+++ b/salt/ssh.sls
@@ -9,7 +9,7 @@ ensure-salt-ssh-is-installed:
 ensure-roster-config:
   file.managed:
     - name: {{ salt_settings.config_path }}/roster
-    - source: salt://salt/files/roster.jinja
+    - source: salt://{{ slspath }}/files/roster.jinja
     - template: jinja
 {% if salt_settings.install_packages %}
     - require:
diff --git a/salt/standalone.sls b/salt/standalone.sls
index 1b3c2a1..4bc3770 100644
--- a/salt/standalone.sls
+++ b/salt/standalone.sls
@@ -8,7 +8,7 @@ salt-minion:
   file.recurse:
     - name: {{ salt_settings.config_path }}/minion.d
     - template: jinja
-    - source: salt://salt/files/minion.d
+    - source: salt://{{ slspath }}/files/minion.d
     - clean: {{ salt_settings.clean_config_d_dir }}
     - exclude_pat: _*
     - context: