diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp index 3abdb33..2c0ca8f 100644 --- a/ejabberd/manifests/init.pp +++ b/ejabberd/manifests/init.pp @@ -103,6 +103,14 @@ class 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 { file { "/var/www/jabber": ensure => directory, @@ -125,14 +133,6 @@ class ejabberd { 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: } } } diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp index 45af359..66df2dc 100644 --- a/vsroom/manifests/init.pp +++ b/vsroom/manifests/init.pp @@ -115,14 +115,15 @@ class vsroom { source => "puppet:///modules/vsroom/vsroom-httpd.conf", } - if $vsroom_webhosts { - define configwebhost() { - file { "/srv/www/https/${name}/vsroom": - ensure => link, - target => "/var/www/vsroom", - require => File["/srv/www/https/${name}"], - } + define configwebhost() { + file { "/srv/www/https/${name}/vsroom": + ensure => link, + target => "/var/www/vsroom", + require => File["/srv/www/https/${name}"], } + } + + if $vsroom_webhosts { configwebhost { $vsroom_webhosts: } }