From d32b17d3b30878d3ca2f50e510e39b539b8b09cf Mon Sep 17 00:00:00 2001 From: Kim Sondrup Date: Thu, 4 Nov 2021 21:28:52 +0100 Subject: [PATCH] Allow systemd to mask postgresql service file --- manifests/server/config.pp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/manifests/server/config.pp b/manifests/server/config.pp index 038e1c5de7..c3ca6b5c40 100644 --- a/manifests/server/config.pp +++ b/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'], + } } } }