diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp index aaad0db..ed53085 100644 --- a/ejabberd/manifests/init.pp +++ b/ejabberd/manifests/init.pp @@ -132,29 +132,31 @@ class ejabberd { } } + $htdocs = "/usr/share/ejabberd/htdocs" + define configwebhost() { file { "/srv/www/https/${name}/jabber": ensure => link, - target => "/var/www/jabber", + target => $htdocs, require => File["/srv/www/https/${name}"], } } if $ejabberd_webhosts { - file { "/var/www/jabber": + file { $htdocs: ensure => directory, mode => "0755", owner => "root", group => "root", } - file { "/var/www/jabber/.htaccess": + file { "${htdocs}/.htaccess": ensure => present, mode => "0644", owner => "root", group => "root", source => "puppet:///modules/ejabberd/htaccess", - require => File["/var/www/jabber"], + require => File[$htdocs], } apache::configfile { "ejabberd.conf": @@ -164,6 +166,7 @@ class ejabberd { configwebhost { $ejabberd_webhosts: } } + }