File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
manifests/server/instance Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 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}" :
Original file line number Diff line number Diff 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' ) }
You can’t perform that action at this time.
0 commit comments