diff --git a/hastymail/manifests/init.pp b/hastymail/manifests/init.pp index c44de2f..c4044ab 100644 --- a/hastymail/manifests/init.pp +++ b/hastymail/manifests/init.pp @@ -13,8 +13,8 @@ class hastymail { ensure => present, source => "puppet:///files/packages/$hastymail_package", mode => 0644, - owner => root, - group => root, + owner => "root", + group => "root", links => follow, } util::extract::tar { "/usr/local/share/hastymail": @@ -27,22 +27,16 @@ class hastymail { file { "/etc/hastymail2": ensure => directory, mode => 0750, - owner => root, - group => $operatingsystem ? { - ubuntu => "www-data", - default => "httpsd", - }, + owner => "root", + group => "${apache::sslserver::group}", } file { "/etc/hastymail2/hastymail2.conf": ensure => present, source => [ "puppet:///private/hastymail2.conf", "puppet:///files/mail/hastymail2.conf", ], mode => 0640, - owner => root, - group => $operatingsystem ? { - ubuntu => "www-data", - default => "httpsd", - }, + owner => "root", + group => "${apache::sslserver::group}", require => File["/etc/hastymail2"], } exec { "rm /etc/hastymail2/hastymail2.rc && php /usr/local/share/hastymail/install_scripts/install_config.php /etc/hastymail2/hastymail2.conf /etc/hastymail2/hastymail2.rc": @@ -54,12 +48,9 @@ class hastymail { } file { "/etc/hastymail2/hastymail2.rc": ensure => present, - mode => 0640, - owner => root, - group => $operatingsystem ? { - ubuntu => "www-data", - default => "httpsd", - }, + mode => 0640, + owner => "root", + group => "${apache::sslserver::group}", } }