Skip to content

Commit 4c46072

Browse files
committed
don't set data_directory in config when we configure it via env
Fixes: #1576
1 parent 411e7bc commit 4c46072

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

manifests/server/instance/config.pp

+5-3
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,11 @@
219219
}
220220
}
221221

222-
postgresql::server::config_entry { "data_directory_for_instance_${name}":
223-
key => 'data_directory',
224-
value => $datadir,
222+
unless $facts['service_provider'] == 'systemd' and $facts['os']['family'] in ['RedHat', 'Gentoo'] {
223+
postgresql::server::config_entry { "data_directory_for_instance_${name}":
224+
key => 'data_directory',
225+
value => $datadir,
226+
}
225227
}
226228
if $timezone {
227229
postgresql::server::config_entry { "timezone_for_instance_${name}":

spec/defines/server_instance_spec.rb

-2
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ class { 'postgresql::server':
123123
it { is_expected.to contain_postgresql_conn_validator('validate_service_is_running_instance_test1') }
124124
it { is_expected.to contain_postgresql_conf('port_for_instance_test1') }
125125
it { is_expected.to contain_postgresql_conf('log_statement_stats_test1') }
126-
it { is_expected.to contain_postgresql_conf('data_directory_for_instance_test1') }
127126
it { is_expected.to contain_postgresql_conf('autovacuum_vacuum_scale_factor_test1') }
128127
it { is_expected.to contain_postgresql_conf('authentication_timeout_test1') }
129128
it { is_expected.to contain_postgresql__server__role('app_test1') }
@@ -159,7 +158,6 @@ class { 'postgresql::server':
159158
it { is_expected.to contain_file('/opt/pgsql') }
160159
it { is_expected.to contain_postgresql__server__config_entry('authentication_timeout_test1') }
161160
it { is_expected.to contain_postgresql__server__config_entry('autovacuum_vacuum_scale_factor_test1') }
162-
it { is_expected.to contain_postgresql__server__config_entry('data_directory_for_instance_test1') }
163161
it { is_expected.to contain_postgresql__server__config_entry('log_statement_stats_test1') }
164162
it { is_expected.to contain_postgresql__server__config_entry('password_encryption_for_instance_test1') }
165163
it { is_expected.to contain_postgresql__server__config_entry('port_for_instance_test1') }

0 commit comments

Comments
 (0)