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

Fixed ejabberd and vsroom modules with Puppet 2.7

Browse source
This commit is contained in:
Ossi Salmi 2011-11-30 09:48:06 +02:00 • committed by Timo Mkinen
parent e43512adad
commit c83dcc03f3
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ejabberd/manifests/init.pp
View file

@ -103,6 +103,14 @@ class ejabberd {
notify => Service["ejabberd"], notify => Service["ejabberd"],
} }
define configwebhost() {
file { "/srv/www/https/${name}/jabber":
ensure => link,
target => "/var/www/jabber",
require => File["/srv/www/https/${name}"],
}
}
if $ejabberd_webhosts { if $ejabberd_webhosts {
file { "/var/www/jabber": file { "/var/www/jabber":
ensure => directory, ensure => directory,
@ -125,14 +133,6 @@ class ejabberd {
source => "puppet:///modules/ejabberd/ejabberd-httpd.conf", source => "puppet:///modules/ejabberd/ejabberd-httpd.conf",
} }
define configwebhost() {
file { "/srv/www/https/${name}/jabber":
ensure => link,
target => "/var/www/jabber",
require => File["/srv/www/https/${name}"],
}
}
configwebhost { $ejabberd_webhosts: } configwebhost { $ejabberd_webhosts: }
} }
} }

3
vsroom/manifests/init.pp
View file

@ -115,7 +115,6 @@ class vsroom {
source => "puppet:///modules/vsroom/vsroom-httpd.conf", source => "puppet:///modules/vsroom/vsroom-httpd.conf",
} }
if $vsroom_webhosts {
define configwebhost() { define configwebhost() {
file { "/srv/www/https/${name}/vsroom": file { "/srv/www/https/${name}/vsroom":
ensure => link, ensure => link,
@ -123,6 +122,8 @@ class vsroom {
require => File["/srv/www/https/${name}"], require => File["/srv/www/https/${name}"],
} }
} }
if $vsroom_webhosts {
configwebhost { $vsroom_webhosts: } configwebhost { $vsroom_webhosts: }
} }