fix service reload/restart for correct instance in server_instance/se…

…rver::config_entry define

manifests/server/config_entry.pp

@@ -12,6 +12,7 @@
   Optional[Variant[String[1], Numeric, Array[String[1]]]] $value   = undef,
   Stdlib::Absolutepath                                    $path    = $postgresql::server::postgresql_conf_path,
   Optional[String[1]]                                     $comment = undef,
+  String[1]                                               $instance_name = 'main',
 ) {
   # Those are the variables that are marked as "(change requires restart)"
   # on postgresql.conf.  Items are ordered as on postgresql.conf.
@@ -72,15 +73,15 @@
       versioncmp($postgresql::server::_version, $requires_restart_until[$key]) < 0
   )) {
     Postgresql_conf {
-      notify => Class['postgresql::server::reload'],
+      notify => Postgresql::Server::Instance::Reload[$instance_name],
     }
   } elsif $postgresql::server::service_restart_on_change {
     Postgresql_conf {
-      notify => Class['postgresql::server::service'],
+      notify => Postgresql::Server::Instance::Service[$instance_name],
     }
   } else {
     Postgresql_conf {
-      before => Class['postgresql::server::service'],
+      before => Postgresql::Server::Instance::Service[$instance_name],
     }
   }
 
@@ -90,6 +91,6 @@
     key     => $key,
     value   => $value,
     comment => $comment,
-    require => Class['postgresql::server::initdb'],
+    require => Postgresql::Server::Instance::Initdb[$instance_name],
   }
 }

manifests/server_instance.pp

@@ -88,11 +88,12 @@
     $value   = $settings['value']
     $comment = $settings['comment']
     postgresql::server::config_entry { "${entry}_${$instance_name}":
-      ensure  => bool2str($value =~ Undef, 'absent', 'present'),
-      key     => $entry,
-      value   => $value,
-      comment => $comment,
-      path    => $config_settings['postgresql_conf_path'],
+      ensure        => bool2str($value =~ Undef, 'absent', 'present'),
+      key           => $entry,
+      value         => $value,
+      comment       => $comment,
+      path          => $config_settings['postgresql_conf_path'],
+      instance_name => $instance_name,
     }
   }
   $pg_hba_rules.each |String[1] $rule_name, Postgresql::Pg_hba_rule $rule| {

spec/classes/server_spec.rb

@@ -129,7 +129,7 @@ class { 'postgresql::globals':
     it { is_expected.to contain_class('postgresql::server') }
 
     it {
-      expect(subject).to contain_Postgresql_conf('data_directory_for_instance_main').that_notifies('Class[postgresql::server::service]')
+      expect(subject).to contain_Postgresql_conf('data_directory_for_instance_main').that_notifies('Postgresql::Server::Instance::Service[main]')
     }
 
     it { is_expected.to contain_postgresql__server__config_entry('data_directory_for_instance_main') }

spec/defines/server/config_entry_spec.rb

@@ -76,7 +76,7 @@
       expect(subject).to contain_postgresql_conf('unix_socket_directories')
         .with(name: 'unix_socket_directories',
               value: '/var/pgsql, /opt/postgresql, /root/')
-        .that_notifies('Class[postgresql::server::service]')
+        .that_notifies('Postgresql::Server::Instance::Service[main]')
     end
   end
 end