summaryrefslogtreecommitdiff
path: root/manifests/defines
diff options
context:
space:
mode:
authorandreas <andreas@immerda.ch>2009-02-17 18:49:44 +0000
committerandreas <andreas@immerda.ch>2009-02-17 18:49:44 +0000
commit2bae6aa65f81d64b82c5a4dd74743e11100f3c20 (patch)
treee59d511821eb412df26d2b5a768452d39d2135de /manifests/defines
parent00556ea1f7dc250da7f374b20038eb2c4b90d99a (diff)
add mode to defines; less permissions for the .git dir
Diffstat (limited to 'manifests/defines')
-rw-r--r--manifests/defines/vhost_files.pp17
-rw-r--r--manifests/defines/vhost_varieties.pp9
2 files changed, 26 insertions, 0 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp
index 12de2ef..5a336cf 100644
--- a/manifests/defines/vhost_files.pp
+++ b/manifests/defines/vhost_files.pp
@@ -279,4 +279,21 @@ define apache::vhost::file::documentrootfile(
}
}
+define apache::vhost::file::documentrootdir(
+ $documentroot,
+ $filename,
+ $thedomain,
+ $owner='root',
+ $group='0',
+ $mode=440
+ ){
+ file{"$documentroot/$filename":
+ ensure => directory,
+ mode => $mode,
+ owner => $owner,
+ group => $group,
+ require => Apache::Vhost::Webdir["$thedomain"],
+ }
+}
+
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
index fe526fe..e5e180b 100644
--- a/manifests/defines/vhost_varieties.pp
+++ b/manifests/defines/vhost_varieties.pp
@@ -299,6 +299,15 @@ define apache::vhost::php::joomla(
thedomain => $name,
owner => $documentroot_owner,
group => $documentroot_group,
+ mode => 440,
+ }
+ apache::vhost::file::documentrootdir{"joomlagitdir":
+ documentroot => $documentroot,
+ filename => '.git',
+ thedomain => $name,
+ owner => $documentroot_owner,
+ group => 'root',
+ mode => 400,
}
}