tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed hastymail module to use apache::sslserver::group variable

Browse source
This commit is contained in:
Ossi Salmi 2012-01-26 14:12:14 +02:00
parent 1f30652e56
commit 6816871c1c
1 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
hastymail/manifests/init.pp
View file

@ -13,8 +13,8 @@ class hastymail {
ensure => present, ensure => present,
source => "puppet:///files/packages/$hastymail_package", source => "puppet:///files/packages/$hastymail_package",
mode => 0644, mode => 0644,
owner => root, owner => "root",
group => root, group => "root",
links => follow, links => follow,
} }
util::extract::tar { "/usr/local/share/hastymail": util::extract::tar { "/usr/local/share/hastymail":
@ -27,22 +27,16 @@ class hastymail {
file { "/etc/hastymail2": file { "/etc/hastymail2":
ensure => directory, ensure => directory,
mode => 0750, mode => 0750,
owner => root, owner => "root",
group => $operatingsystem ? { group => "${apache::sslserver::group}",
ubuntu => "www-data",
default => "httpsd",
},
} }
file { "/etc/hastymail2/hastymail2.conf": file { "/etc/hastymail2/hastymail2.conf":
ensure => present, ensure => present,
source => [ "puppet:///private/hastymail2.conf", source => [ "puppet:///private/hastymail2.conf",
"puppet:///files/mail/hastymail2.conf", ], "puppet:///files/mail/hastymail2.conf", ],
mode => 0640, mode => 0640,
owner => root, owner => "root",
group => $operatingsystem ? { group => "${apache::sslserver::group}",
ubuntu => "www-data",
default => "httpsd",
},
require => File["/etc/hastymail2"], 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": exec { "rm /etc/hastymail2/hastymail2.rc && php /usr/local/share/hastymail/install_scripts/install_config.php /etc/hastymail2/hastymail2.conf /etc/hastymail2/hastymail2.rc":
@ -55,11 +49,8 @@ class hastymail {
file { "/etc/hastymail2/hastymail2.rc": file { "/etc/hastymail2/hastymail2.rc":
ensure => present, ensure => present,
mode => 0640, mode => 0640,
owner => root, owner => "root",
group => $operatingsystem ? { group => "${apache::sslserver::group}",
ubuntu => "www-data",
default => "httpsd",
},
} }
} }