summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorandreas <andreas@immerda.ch>2009-01-28 18:17:35 +0000
committerandreas <andreas@immerda.ch>2009-01-28 18:17:35 +0000
commit09683487d1d50dbff88a5866c63099623159b225 (patch)
treebdc73975bb0dbaec5d2fe405cface5828d479718 /manifests
parentf701bafc60e606b8cbc243b28a16bb9e089c308e (diff)
dependencies for the git-clone
Diffstat (limited to 'manifests')
-rw-r--r--manifests/defines/vhost_varieties.pp19
1 files changed, 11 insertions, 8 deletions
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
index 1fc7a91..4cb97e4 100644
--- a/manifests/defines/vhost_varieties.pp
+++ b/manifests/defines/vhost_varieties.pp
@@ -228,6 +228,12 @@ define apache::vhost::php::joomla(
$documentroot = "${real_path}/www"
# create webdir
+ # for the cloning, $documentroot needs to be absent
+ git::clone{"git_clone_$name":
+ git_repo => "git://git.immerda.ch/ijoomla.git",
+ projectroot => $documentroot
+ }
+ # create and/or put correct permissions
apache::vhost::webdir{$name:
path => $real_path,
owner => $owner,
@@ -235,23 +241,20 @@ define apache::vhost::php::joomla(
documentroot_owner => $documentroot_owner,
documentroot_group => $documentroot_group,
documentroot_mode => $documentroot_mode,
+ require => File["$documentroot/.git"],
}
- git::clone{"git_clone_$name":
- git_repo => "file:///e/gitrepos/joomla",
- projectroot => $documentroot
- }
-
file{[
"$documentroot/components"
,"$documentroot/dmdocuments"
,"$documentroot/images"
,"$documentroot/language"
]:
- ensure => directory,
- mode => 0770;
+ ensure => directory
+ ,mode => 0770
+ ,recurse => true
+ ,require => File["$documentroot/.git"]
}
-
# create vhost configuration file
apache::vhost{$name: