Unbreak Debian support with custom encoding

lib/puppet/type/postgresql_psql.rb

@@ -135,11 +135,7 @@ def matches(value)
   end
 
   autorequire(:anchor) do
-    ["postgresql::server::service::begin::#{self[:instance]}"]
-  end
-
-  autorequire(:service) do
-    ["postgresqld_instance_#{self[:instance]}"]
+    ["postgresql::server::service::end::#{self[:instance]}"]
   end
 
   def should_run_sql(refreshing = false)

manifests/server/instance/service.pp

@@ -42,6 +42,10 @@
       status    => $service_status,
     }
 
+    Anchor["postgresql::server::service::begin::${name}"]
+    -> Service["postgresqld_instance_${name}"]
+    -> Anchor["postgresql::server::service::end::${name}"]
+
     if $service_ensure in ['running', true] {
       # This blocks the class before continuing if chained correctly, making
       # sure the service really is 'up' before continuing.
@@ -56,10 +60,13 @@
         sleep            => 1,
         tries            => 60,
         psql_path        => $psql_path,
-        require          => Service["postgresqld_instance_${name}"],
-        before           => Anchor["postgresql::server::service::end::${name}"],
       }
-      Postgresql::Server::Database <| title == $default_database |> -> Postgresql_conn_validator["validate_service_is_running_instance_${name}"]
+
+      Anchor["postgresql::server::service::begin::${name}"]
+      -> Service["postgresqld_instance_${name}"]
+      -> Postgresql::Server::Database <| title == $default_database |>
+      -> Postgresql_conn_validator["validate_service_is_running_instance_${name}"]
+      -> Anchor["postgresql::server::service::end::${name}"]
     }
   }
 

manifests/server/plperl.pp

@@ -16,5 +16,5 @@
   -> Class['postgresql::server::install']
   -> Package['postgresql-plperl']
   -> Class['postgresql::server::service']
-  anchor { 'postgresql::server::plperl::end': }
+  -> anchor { 'postgresql::server::plperl::end': }
 }

spec/acceptance/aaa_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper_acceptance'
+
+describe 'postgresql::server' do
+  let(:pp) do
+    ENV['RSPEC_DEBUG'] = 'yes'
+    <<-MANIFEST
+      class { 'postgresql::globals':
+        encoding => 'UTF8',
+        locale   => 'en_NG',
+      } ->
+      class { 'postgresql::server': }
+    MANIFEST
+  end
+
+  it 'with defaults' do
+    export_locales('en_NG.UTF8')
+    idempotent_apply(pp, debug: true)
+    puts '-------------------------------'
+    puts LitmusHelper.instance.run_shell('ss -lntp').stdout
+    puts '-------------------------------'
+    puts LitmusHelper.instance.run_shell('journalctl -u postgresql').stdout
+    puts '-------------------------------'
+    puts LitmusHelper.instance.run_shell('systemctl status postgresql*').stdout
+    puts '-------------------------------'
+    puts LitmusHelper.instance.run_shell("su postgres -c 'psql -c \\\\l'").stdout
+    puts '-------------------------------'
+    puts LitmusHelper.instance.run_shell('true &>/dev/null </dev/tcp/127.0.0.1/5432 && echo open || echo closed').stdout
+    puts '-------------------------------'
+    expect(port(5432)).to be_listening.on('127.0.0.1').with('tcp')
+    expect(psql('--command="\l" postgres', 'postgres').stdout).to match(%r{List of databases})
+    expect(psql('--command="SELECT pg_encoding_to_char(encoding) FROM pg_database WHERE datname=\'template1\'"').stdout).to match(%r{UTF8})
+  end
+end

spec/acceptance/overridden_settings_spec.rb

@@ -40,6 +40,9 @@ class { 'postgresql::server':
 
   it 'with additional hiera entries' do
     idempotent_apply(pp)
+    puts '-------------- overridden_settings_spec.rb -----------------'
+    puts LitmusHelper.instance.run_shell('ss -lntp').stdout
+    puts '-------------------------------'
     expect(port(5432)).to be_listening
     expect(psql('--command="\l" postgres', 'postgres').stdout).to match(%r{List of databases})
     expect(run_shell('PGPASSWORD=supersecret psql -U testusername -h localhost --command="\l"').stdout).to match 'List of databases'