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

vsroom: Style fixes, defines should not exist inside classes

Browse source
This commit is contained in:
Ossi Salmi 2013-12-09 09:42:48 +02:00
parent 7bf1bfb06a
commit 845070a552
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
vsroom/manifests/init.pp
View file

@ -11,9 +11,11 @@
# $webhosts: # $webhosts:
# List of vsroom virtual hosts # List of vsroom virtual hosts
# #
class vsroom($authurl="/collab/?action=authcredentials", class vsroom(
$boshurl="/bosh/", $authurl="/collab/?action=authcredentials",
$webhosts=undef) { $boshurl="/bosh/",
$webhosts=undef
) {
if !$vsroom_package { if !$vsroom_package {
if $vsroom_package_latest { if $vsroom_package_latest {
@ -62,23 +64,28 @@ class vsroom($authurl="/collab/?action=authcredentials",
require => Python::Setup::Install["/usr/local/src/vsroom"], require => Python::Setup::Install["/usr/local/src/vsroom"],
} }
define configwebhost($htdocs) {
file { "/srv/www/https/${name}/vsroom":
ensure => link,
target => $htdocs,
require => File["/srv/www/https/${name}"],
}
}
if $webhosts { if $webhosts {
apache::configfile { "vsroom.conf": apache::configfile { "vsroom.conf":
http => false, http => false,
source => "puppet:///modules/vsroom/vsroom-httpd.conf", source => "puppet:///modules/vsroom/vsroom-httpd.conf",
} }
configwebhost { $webhosts: vsroom::configwebhost { $webhosts:
htdocs => $htdocs, htdocs => $htdocs,
} }
} }
} }
# Enable vsroom for virtual host.
#
define vsroom::configwebhost($htdocs) {
file { "/srv/www/https/${name}/vsroom":
ensure => link,
target => $htdocs,
require => File["/srv/www/https/${name}"],
}
}