add file resource old-systemd-override back to group and incorproate review comments

Author: sheenaajay

manifests/server/config.pp

@@ -224,19 +224,19 @@
       # - $datadir
       # - @extra_systemd_config
 
-  if (versioncmp($facts['puppetversion'], '6.1.0') < 0) {
-    exec { 'restart-systemd':
-      command     => 'systemctl daemon-reload',
-      refreshonly => true,
-      path        => '/bin:/usr/bin:/usr/local/bin',
-      require     => File['old-systemd-override'],
-      before      => Class['postgresql::server::service'],
+    if (versioncmp($facts['puppetversion'], '6.1.0') < 0) {
+      exec { 'restart-systemd':
+        command     => 'systemctl daemon-reload',
+        refreshonly => true,
+        path        => '/bin:/usr/bin:/usr/local/bin',
+        require     => File['old-systemd-override'],
+        before      => Class['postgresql::server::service'],
+      }
+      $systemd_notify = Exec['restart-systemd']
+    }
+    else {
+      $systemd_notify = Class['postgresql::server::service']
     }
-    $systemd_notify = Exec['restart-systemd']
-  }
-  else {
-    $systemd_notify = Class['postgresql::server::service']
-  }
 
     file {
       default:
@@ -258,13 +258,12 @@
           content => template('postgresql/systemd-override.erb'),
           require => File['systemd-conf-dir'],
       ;
-    }
 
-    # Remove old unit file to avoid conflicts
-    file {'old-systemd-override':
-      ensure => absent,
-      path   => "/etc/systemd/system/${service_name}.service",
-      before => $systemd_notify,
+      # Remove old unit file to avoid conflicts
+      'old-systemd-override':
+          ensure => absent,
+          path   => "/etc/systemd/system/${service_name}.service",
+      ;
     }
   }
 }