diff options
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 19 |
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: |