From 16dbd14749e797c4ac95c29062cccfc058b35247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Tue, 7 Sep 2021 16:11:08 -1000
Subject: [PATCH] Fix changing default encoding

Starting with 79fa35591e099a7b6981b873b930b943e5dc1827 it is not
possible to set a custom encoding on systems where initdb is not needed
(e.g. Debian).  The autorequire introduce a circular dependency:

```
dependency cycles found: (Anchor[postgresql::server::service::begin] =>
                          Postgresql_psql[Set template1 encoding to UTF-8] =>
                          Class[Postgresql::Server::Initdb] =>
                          Postgresql_conf[listen_addresses] =>
                          Class[Postgresql::Server::Service] =>
                          Anchor[postgresql::server::service::begin])
```

Move the relevant code from postgresql::server::initdb to
postgresql::server::late_initdb and include it when applicable so that
the postgresql_psql command gets run after the service has started up.
---
 manifests/server/initdb.pp      | 27 +----------------------
 manifests/server/late_initdb.pp | 39 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 manifests/server/late_initdb.pp

diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp
index 2454a43c62..5aabd0426d 100644
--- a/manifests/server/initdb.pp
+++ b/manifests/server/initdb.pp
@@ -13,19 +13,8 @@
   $data_checksums = $postgresql::server::data_checksums
   $group          = $postgresql::server::group
   $user           = $postgresql::server::user
-  $psql_path      = $postgresql::server::psql_path
-  $port           = $postgresql::server::port
   $module_workdir = $postgresql::server::module_workdir
 
-  # Set the defaults for the postgresql_psql resource
-  Postgresql_psql {
-    psql_user  => $user,
-    psql_group => $group,
-    psql_path  => $psql_path,
-    port       => $port,
-    cwd        => $module_workdir,
-  }
-
   if $facts['os']['family'] == 'RedHat' and $facts['os']['selinux']['enabled'] == true {
     $seltype = 'postgresql_db_t'
     $logdir_type = 'postgresql_log_t'
@@ -147,20 +136,6 @@
       cwd       => $module_workdir,
     }
   } elsif $encoding != undef {
-    # [workaround]
-    # by default pg_createcluster encoding derived from locale
-    # but it do does not work by installing postgresql via puppet because puppet
-    # always override LANG to 'C'
-    postgresql_psql { "Set template1 encoding to ${encoding}":
-      command => "UPDATE pg_database
-        SET datistemplate = FALSE
-        WHERE datname = 'template1'
-        ;
-        UPDATE pg_database
-        SET encoding = pg_char_to_encoding('${encoding}'), datistemplate = TRUE
-        WHERE datname = 'template1'",
-      unless  => "SELECT datname FROM pg_database WHERE
-        datname = 'template1' AND encoding = pg_char_to_encoding('${encoding}')",
-    }
+    include postgresql::server::late_initdb
   }
 }
diff --git a/manifests/server/late_initdb.pp b/manifests/server/late_initdb.pp
new file mode 100644
index 0000000000..ea7b0a8624
--- /dev/null
+++ b/manifests/server/late_initdb.pp
@@ -0,0 +1,39 @@
+# @summary Manage the default encoding when database initialization is managed by the package
+#
+# @api private
+class postgresql::server::late_initdb {
+  assert_private()
+
+  $encoding       = $postgresql::server::encoding
+  $user           = $postgresql::server::user
+  $group          = $postgresql::server::group
+  $psql_path      = $postgresql::server::psql_path
+  $port           = $postgresql::server::port
+  $module_workdir = $postgresql::server::module_workdir
+
+  # Set the defaults for the postgresql_psql resource
+  Postgresql_psql {
+    psql_user  => $user,
+    psql_group => $group,
+    psql_path  => $psql_path,
+    port       => $port,
+    cwd        => $module_workdir,
+  }
+
+  # [workaround]
+  # by default pg_createcluster encoding derived from locale
+  # but it do does not work by installing postgresql via puppet because puppet
+  # always override LANG to 'C'
+  postgresql_psql { "Set template1 encoding to ${encoding}":
+    command => "UPDATE pg_database
+      SET datistemplate = FALSE
+      WHERE datname = 'template1'
+      ;
+      UPDATE pg_database
+      SET encoding = pg_char_to_encoding('${encoding}'), datistemplate = TRUE
+      WHERE datname = 'template1'",
+    unless  => "SELECT datname FROM pg_database WHERE
+      datname = 'template1' AND encoding = pg_char_to_encoding('${encoding}')",
+    before  => Anchor['postgresql::server::service::end']
+  }
+}