Skip to content

Commit b26f10d

Browse files
authored
Merge pull request #29 from claranet/postgresql_config_path
Fix _postgresql_config_path not defaulting to datadir on redhat-like os. This woul cause issues if postgresql_config_path is not set explicity when using a datadir different from the default.
2 parents b91e383 + c9b075b commit b26f10d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

vars/amazon-2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# postgresql_version: 9
33
_postgresql_data_dir: "{{ postgresql_data_dir | d('/var/lib/pgsql/data', true) }}"
44
_postgresql_bin_path: "{{ postgresql_bin_path | d('/usr/bin', true) }}"
5-
_postgresql_config_path: "{{ postgresql_config_path | d('/var/lib/pgsql/data', true) }}"
5+
_postgresql_config_path: "{{ postgresql_config_path | d(_postgresql_data_dir, true) }}"
66
_postgresql_daemon: "{{ postgresql_daemon | d('postgresql', true) }}"
77
_postgresql_packages:
88
- postgresql

vars/fedora-35.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# postgresql_version: "13"
33
_postgresql_data_dir: "{{ postgresql_data_dir | d('/var/lib/pgsql/data', true) }}"
44
_postgresql_bin_path: "{{ postgresql_bin_path | d('/usr/bin', true) }}"
5-
_postgresql_config_path: "{{ postgresql_config_path | d('/var/lib/pgsql/data', true) }}"
5+
_postgresql_config_path: "{{ postgresql_config_path | d(_postgresql_data_dir, true) }}"
66
_postgresql_daemon: "{{ postgresql_daemon | d('postgresql', true) }}"
77
_postgresql_packages:
88
- postgresql{{ postgresql_version }}-server

vars/fedora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# postgresql_version: 14
33
_postgresql_data_dir: "{{ postgresql_data_dir | d('/var/lib/pgsql/data', true) }}"
44
_postgresql_bin_path: "{{ postgresql_bin_path | d('/usr/pgsql-' ~ postgresql_version ~ '/bin', true) }}"
5-
_postgresql_config_path: "{{ postgresql_config_path | d('/var/lib/pgsql/data', true) }}"
5+
_postgresql_config_path: "{{ postgresql_config_path | d(_postgresql_data_dir, true) }}"
66
_postgresql_daemon: "{{ postgresql_daemon | d('postgresql-' ~ postgresql_version, true) }}"
77
_postgresql_packages:
88
- python3-pip

vars/redhat-family.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# postgresql_version: 14
33
_postgresql_data_dir: "{{ postgresql_data_dir | d('/var/lib/pgsql/data', true) }}"
44
_postgresql_bin_path: "{{ postgresql_bin_path | d('/usr/pgsql-' ~ postgresql_version ~ '/bin', true) }}"
5-
_postgresql_config_path: "{{ postgresql_config_path | d('/var/lib/pgsql/data', true) }}"
5+
_postgresql_config_path: "{{ postgresql_config_path | d(_postgresql_data_dir, true) }}"
66
_postgresql_daemon: "{{ postgresql_daemon | d('postgresql-' ~ postgresql_version, true) }}"
77
_postgresql_packages:
88
# needed for installing psycopg2

0 commit comments

Comments
 (0)