don't set data_directory in config when we configure it via env

evgeni · evgeni · commit 7fa31c2c49ee · 2024-02-21T15:05:10.000+01:00
Fixes: #1576
diff --git a/manifests/server/instance/config.pp b/manifests/server/instance/config.pp
@@ -219,9 +219,11 @@
     }
   }
 
-  postgresql::server::config_entry { "data_directory_for_instance_${name}":
-    key   => 'data_directory',
-    value => $datadir,
+  unless $facts['service_provider'] == 'systemd' and $facts['os']['family'] in ['RedHat', 'Gentoo'] {
+    postgresql::server::config_entry { "data_directory_for_instance_${name}":
+      key   => 'data_directory',
+      value => $datadir,
+    }
   }
   if $timezone {
     postgresql::server::config_entry { "timezone_for_instance_${name}":

Original file line number	Diff line number	Diff line change
`@@ -219,9 +219,11 @@`
`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}":`