Cleaned up vsroom module
This commit is contained in:
parent
91d4d4711d
commit
e2f086a7af
1 changed files with 8 additions and 16 deletions
|
@ -28,8 +28,8 @@ class vsroom {
|
|||
file { "/usr/local/src/vsroom.tar.gz":
|
||||
ensure => present,
|
||||
mode => 0644,
|
||||
owner => root,
|
||||
group => root,
|
||||
owner => "root",
|
||||
group => "root",
|
||||
source => "puppet:///files/packages/${vsroom_package}",
|
||||
links => follow,
|
||||
}
|
||||
|
@ -48,9 +48,9 @@ class vsroom {
|
|||
if $vsroom_datadir {
|
||||
file { "${vsroom_datadir}":
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
group => root,
|
||||
mode => 0750,
|
||||
owner => "root",
|
||||
group => "vsroom",
|
||||
}
|
||||
|
||||
file { "/var/lib/vsroom":
|
||||
|
@ -61,20 +61,12 @@ class vsroom {
|
|||
} else {
|
||||
file { "/var/lib/vsroom":
|
||||
ensure => directory,
|
||||
mode => 0755,
|
||||
owner => root,
|
||||
group => root,
|
||||
mode => 0750,
|
||||
owner => "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 ? {
|
||||
"ubuntu" => "/usr/local/share/vsroom/htdocs",
|
||||
default => "/usr/share/vsroom/htdocs",
|
||||
|
|
Loading…
Add table
Reference in a new issue