From 5c094a05ca64b48a1732c5a746f3c8644187fdf1 Mon Sep 17 00:00:00 2001 From: Gilou Date: Thu, 11 Oct 2018 02:37:51 +0200 Subject: [PATCH] Rename setting to add_profile, add an example to explain it --- pillar.example | 3 +++ postgres/defaults.yaml | 2 +- postgres/upstream.sls | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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 e2670bf..b0d0fb5 100644 --- a/postgres/defaults.yaml +++ b/postgres/defaults.yaml @@ -2,7 +2,7 @@ postgres: use_upstream_repo: True - add_path: False # add bin_dir to $PATH, if installed from repos + add_profile: False # add bin_dir to $PATH, if installed from repos version: '10' pkg: postgresql pkgs_extra: [] diff --git a/postgres/upstream.sls b/postgres/upstream.sls index 427574d..c2d2ac7 100644 --- a/postgres/upstream.sls +++ b/postgres/upstream.sls @@ -5,7 +5,7 @@ {%- if postgres.use_upstream_repo == true -%} - {%- if postgres.add_path -%} + {%- if postgres.add_profile -%} postgresql-profile: file.managed: - name: /etc/profile.d/postgres.sh