diff --git a/pillar.example b/pillar.example index 1c27387..fc17893 100644 --- a/pillar.example +++ b/pillar.example @@ -8,6 +8,9 @@ postgres: use_upstream_repo: False # Version to install from upstream repository (if upstream_repo: True) version: '10' + # Set True to add a file in /etc/profile.d adding the bin dir in $PATH + # as packages from upstream put them somewhere like /usr/pgsql-10/bin + add_profile: False # If automatic package installation fails, use `fromrepo` to specify the # upstream repo to install packages from [#133, #185] (if upstream_repo: True) fromrepo: 'jessie-pgdg' diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml index 71f473d..b0d0fb5 100644 --- a/postgres/defaults.yaml +++ b/postgres/defaults.yaml @@ -2,6 +2,7 @@ postgres: use_upstream_repo: True + add_profile: False # add bin_dir to $PATH, if installed from repos version: '10' pkg: postgresql pkgs_extra: [] diff --git a/postgres/templates/postgres.sh.j2 b/postgres/templates/postgres.sh.j2 new file mode 100644 index 0000000..fe69af7 --- /dev/null +++ b/postgres/templates/postgres.sh.j2 @@ -0,0 +1,8 @@ +###################################################################### +# ATTENTION! Managed by SaltStack. # +# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN! # +###################################################################### + +if ! echo $PATH | grep -q {{ bin_dir }} ; then + export PATH=$PATH:{{ bin_dir }} +fi diff --git a/postgres/upstream.sls b/postgres/upstream.sls index 45605c4..c2d2ac7 100644 --- a/postgres/upstream.sls +++ b/postgres/upstream.sls @@ -5,6 +5,18 @@ {%- if postgres.use_upstream_repo == true -%} + {%- if postgres.add_profile -%} +postgresql-profile: + file.managed: + - name: /etc/profile.d/postgres.sh + - user: root + - group: root + - mode: 644 + - template: jinja + - source: salt://postgres/templates/postgres.sh.j2 + - defaults: + bin_dir: {{ postgres.bin_dir }} + {%- endif %} # Add upstream repository for your distro postgresql-repo: pkgrepo.managed: