Merge pull request puppetlabs#976 from 2ndquadrant-it/waldir

david22swan · web-flow · commit 346e67242e35 · 2018-10-11T14:42:11.000+01:00
Change initdb option '--xlogdir' to '-X' for PG10 compatibility
diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp
@@ -72,7 +72,7 @@
     $ic_base = "${initdb_path} --encoding '${encoding}' --pgdata '${datadir}'"
     $ic_xlog = $xlogdir ? {
       undef   => $ic_base,
-      default => "${ic_base} --xlogdir '${xlogdir}'"
+      default => "${ic_base} -X '${xlogdir}'"
     }
 
     # The xlogdir need to be present before initdb runs.

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`$ic_base = "${initdb_path} --encoding '${encoding}' --pgdata '${datadir}'"`
`73`	`73`	`$ic_xlog = $xlogdir ? {`
`74`	`74`	`undef => $ic_base,`
`75`		`- default => "${ic_base} --xlogdir '${xlogdir}'"`
	`75`	`+ default => "${ic_base} -X '${xlogdir}'"`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`# The xlogdir need to be present before initdb runs.`