aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-11 20:44:59 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-11 20:44:59 -0300
commit2d304317118ecb8296bcc3ed489dea7af7828b03 (patch)
treeb6a156f3ddb2455d7a4fb7471064f877df85f03b /manifests
parentff2ef8f403968e16d662676f4dfbbdd991270804 (diff)
downloadpuppet-ikiwiki-2d304317118ecb8296bcc3ed489dea7af7828b03.tar.gz
puppet-ikiwiki-2d304317118ecb8296bcc3ed489dea7af7828b03.tar.bz2
Adding git_folder parameter
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp3
-rw-r--r--manifests/instance.pp2
2 files changed, 3 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b2c25b2..74edacd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,8 @@
class ikiwiki(
$sites_folder = '/var/sites',
$git_implementation = 'gitolite',
- $www_user = 'www-data'
+ $www_user = 'www-data',
+ $git_folder = '/var/git/repositories'
) {
package { [ "ikiwiki", "po4a" ]:
ensure => installed,
diff --git a/manifests/instance.pp b/manifests/instance.pp
index c7648da..a8ed0d9 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -95,7 +95,7 @@ define ikiwiki::instance(
}
# See http://rtime.felk.cvut.cz/~sojka/blog/using-ikiwiki-with-gitolite/
- file { "/var/git/repositories/${name}.git/hooks/post-update":
+ file { "${ikiwiki::git_folder}/${name}.git/hooks/post-update":
ensure => present,
owner => $owner,
group => $ikiwiki::git_implementation,