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

Puppet 3 fixes for ejabberd and vsroom

Browse source
This commit is contained in:
Ossi Salmi 2013-05-02 23:19:20 +03:00
parent 22bacf19b4
commit 5b12b921b3
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ejabberd/manifests/init.pp
View file

@ -156,7 +156,7 @@ class ejabberd {
$htdocs = "/usr/share/ejabberd/htdocs" $htdocs = "/usr/share/ejabberd/htdocs"
define configwebhost() { define configwebhost($htdocs) {
file { "/srv/www/https/${name}/bosh": file { "/srv/www/https/${name}/bosh":
ensure => link, ensure => link,
target => $htdocs, target => $htdocs,
@ -187,7 +187,9 @@ class ejabberd {
source => "puppet:///modules/ejabberd/ejabberd-httpd.conf", source => "puppet:///modules/ejabberd/ejabberd-httpd.conf",
} }
configwebhost { $ejabberd_webhosts: } configwebhost { $ejabberd_webhosts:
htdocs => $htdocs,
}
} }
} }

6
vsroom/manifests/init.pp
View file

@ -106,7 +106,7 @@ class vsroom::common {
require => Python::Setup::Install["/usr/local/src/vsroom"], require => Python::Setup::Install["/usr/local/src/vsroom"],
} }
define configwebhost() { define configwebhost($htdocs) {
file { "/srv/www/https/${name}/vsroom": file { "/srv/www/https/${name}/vsroom":
ensure => link, ensure => link,
target => $htdocs, target => $htdocs,
@ -120,7 +120,9 @@ class vsroom::common {
source => "puppet:///modules/vsroom/vsroom-httpd.conf", source => "puppet:///modules/vsroom/vsroom-httpd.conf",
} }
configwebhost { $vsroom_webhosts: } configwebhost { $vsroom_webhosts:
htdocs => $htdocs,
}
} }
} }