Merge pull request #1310 from kim-sondrup/mask-systemd

Allow systemd to mask postgresql service file

Author: ekohl

manifests/server/config.pp

@@ -22,6 +22,7 @@
   $datadir                      = $postgresql::server::datadir
   $logdir                       = $postgresql::server::logdir
   $service_name                 = $postgresql::server::service_name
+  $service_enable               = $postgresql::server::service_enable
   $log_line_prefix              = $postgresql::server::log_line_prefix
   $timezone                     = $postgresql::server::timezone
   $password_encryption          = $postgresql::server::password_encryption
@@ -256,12 +257,16 @@
           content => template('postgresql/systemd-override.erb'),
           require => File['systemd-conf-dir'],
       ;
+    }
 
+    if $service_enable != 'mask' {
       # Remove old unit file to avoid conflicts
-      'old-systemd-override':
-          ensure => absent,
-          path   => "/etc/systemd/system/${service_name}.service",
-      ;
+      file { 'old-systemd-override':
+        ensure => absent,
+        path   => "/etc/systemd/system/${service_name}.service",
+        notify => [Exec['restart-systemd'], Class['postgresql::server::service']],
+        before => Class['postgresql::server::reload'],
+      }
     }
   }
 }