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

Moved ejabberd htdocs to /usr/share/ejabberd

Browse source
This commit is contained in:
Ossi Salmi 2012-06-14 15:23:35 +03:00
parent 0a818cc10f
commit b1401f4c04
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ejabberd/manifests/init.pp
View file

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