Merge pull request #211 from mkotsbak/fix_relative_references

Make formula relative to actual directory by using 'tpldir'

postgres/client/init.sls

@@ -1,4 +1,4 @@
-{%- from "postgres/map.jinja" import postgres with context -%}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 {%- set pkgs = [] %}
 {%- for pkg in (postgres.pkg_client, postgres.pkg_libpq_dev) %}

postgres/dev.sls

@@ -1,4 +1,4 @@
-{% from "postgres/map.jinja" import postgres with context %}
+{% from tpldir + "/map.jinja" import postgres with context %}
 
 {% if grains.os not in ('Windows', 'MacOS',) %}
 
@@ -44,7 +44,7 @@ postgresql-{{ bin }}-altinstall:
 postgres_maxfiles_limits_conf:
   file.managed:
     - name: /Library/LaunchDaemons/limit.maxfiles.plist
-    - source: salt://postgres/templates/limit.maxfiles.plist
+    - source: salt://{{ tpldir }}/templates/limit.maxfiles.plist
     - context:
       soft_limit: {{ postgres.limits.soft or postgres.limits.hard }}
       hard_limit: {{ postgres.limits.hard or postgres.limits.soft }}
@@ -62,7 +62,7 @@ postgres-desktop-shortcut-clean:
 postgres-desktop-shortcut-add:
   file.managed:
     - name: /tmp/mac_shortcut.sh
-    - source: salt://postgres/templates/mac_shortcut.sh
+    - source: salt://{{ tpldir }}/templates/mac_shortcut.sh
     - mode: 755
     - template: jinja
     - context:

postgres/dropped.sls

@@ -1,4 +1,4 @@
-{% from "postgres/map.jinja" import postgres with context %}
+{% from tpldir + "/map.jinja" import postgres with context %}
 
 postgresql-dead:
   service.dead:

postgres/macos/init.sls

@@ -1,4 +1,4 @@
-{% from "postgres/map.jinja" import postgres with context %}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 include:
 {% if postgres.use_upstream_repo == 'postgresapp' %}

postgres/macos/postgresapp.sls

@@ -1,4 +1,4 @@
-{% from "postgres/map.jinja" import postgres as pg with context %}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres as pg with context -%}
 
 # Cleanup first
 pg-remove-prev-archive:

postgres/manage.sls

@@ -1,5 +1,5 @@
-{%- from "postgres/map.jinja" import postgres with context -%}
-{%- from "postgres/macros.jinja" import format_state with context -%}
+{%- from tpldir + "/map.jinja" import postgres with context -%}
+{%- from tpldir + "/macros.jinja" import format_state with context -%}
 
 {%- if salt['postgres.user_create']|default(none) is not callable %}
 

postgres/python.sls

@@ -1,4 +1,4 @@
-{% from "postgres/map.jinja" import postgres with context %}
+{% from tpldir + "/map.jinja" import postgres with context %}
 
 postgresql-python:
   pkg.installed:

postgres/server/image.sls

@@ -1,4 +1,4 @@
-{%- from "postgres/map.jinja" import postgres with context -%}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 # This state is used to launch PostgreSQL with ``pg_ctl`` command and enable it
 # on "boot" during an image (Docker, Virtual Appliance, AMI) preparation

postgres/server/init.sls

@@ -1,4 +1,4 @@
-{%- from "postgres/map.jinja" import postgres with context %}
+{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%}
 
 {%- set includes = [] %}
 {%- if postgres.bake_image %}

postgres/upstream.sls

@@ -1,5 +1,5 @@
-{%- from "postgres/map.jinja" import postgres with context -%}
-{%- from "postgres/macros.jinja" import format_kwargs with context -%}
+{%- from tpldir + "/map.jinja" import postgres with context -%}
+{%- from tpldir + "/macros.jinja" import format_kwargs with context -%}
 
 {%- if 'pkg_repo' in postgres -%}