File tree 2 files changed +5
-5
lines changed
manifests/server/instance
2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 219
219
}
220
220
}
221
221
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
+ }
225
227
}
226
228
if $timezone {
227
229
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':
123
123
it { is_expected . to contain_postgresql_conn_validator ( 'validate_service_is_running_instance_test1' ) }
124
124
it { is_expected . to contain_postgresql_conf ( 'port_for_instance_test1' ) }
125
125
it { is_expected . to contain_postgresql_conf ( 'log_statement_stats_test1' ) }
126
- it { is_expected . to contain_postgresql_conf ( 'data_directory_for_instance_test1' ) }
127
126
it { is_expected . to contain_postgresql_conf ( 'autovacuum_vacuum_scale_factor_test1' ) }
128
127
it { is_expected . to contain_postgresql_conf ( 'authentication_timeout_test1' ) }
129
128
it { is_expected . to contain_postgresql__server__role ( 'app_test1' ) }
@@ -159,7 +158,6 @@ class { 'postgresql::server':
159
158
it { is_expected . to contain_file ( '/opt/pgsql' ) }
160
159
it { is_expected . to contain_postgresql__server__config_entry ( 'authentication_timeout_test1' ) }
161
160
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' ) }
163
161
it { is_expected . to contain_postgresql__server__config_entry ( 'log_statement_stats_test1' ) }
164
162
it { is_expected . to contain_postgresql__server__config_entry ( 'password_encryption_for_instance_test1' ) }
165
163
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