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

Cleaned up vsroom module

Browse source
This commit is contained in:
Ossi Salmi 2012-01-04 01:34:37 +02:00 • committed by Timo Mkinen
parent 91d4d4711d
commit e2f086a7af
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
vsroom/manifests/init.pp
View file

@ -28,8 +28,8 @@ class vsroom {
file { "/usr/local/src/vsroom.tar.gz": file { "/usr/local/src/vsroom.tar.gz":
ensure => present, ensure => present,
mode => 0644, mode => 0644,
owner => root, owner => "root",
group => root, group => "root",
source => "puppet:///files/packages/${vsroom_package}", source => "puppet:///files/packages/${vsroom_package}",
links => follow, links => follow,
} }
@ -48,9 +48,9 @@ class vsroom {
if $vsroom_datadir { if $vsroom_datadir {
file { "${vsroom_datadir}": file { "${vsroom_datadir}":
ensure => directory, ensure => directory,
mode => 0755, mode => 0750,
owner => root, owner => "root",
group => root, group => "vsroom",
} }
file { "/var/lib/vsroom": file { "/var/lib/vsroom":
@ -61,20 +61,12 @@ class vsroom {
} else { } else {
file { "/var/lib/vsroom": file { "/var/lib/vsroom":
ensure => directory, ensure => directory,
mode => 0755, mode => 0750,
owner => root, owner => "root",
group => root, group => "vsroom",
} }
} }
file { "/var/lib/vsroom/.htpasswd":
ensure => present,
mode => 0640,
owner => root,
group => $apache::sslserver::group,
require => File["/var/lib/vsroom"],
}
$htdocs = $operatingsystem ? { $htdocs = $operatingsystem ? {
"ubuntu" => "/usr/local/share/vsroom/htdocs", "ubuntu" => "/usr/local/share/vsroom/htdocs",
default => "/usr/share/vsroom/htdocs", default => "/usr/share/vsroom/htdocs",