aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-12-22 16:22:22 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-12-22 16:22:22 -0200
commitb49f04aee50d4bf0179c2fef3911e0d114d7764b (patch)
tree76a7cb760815f413e748101312d9909ddb2d6ffb
parenta8c852564095a794b5ab5356c7da498fca34dcc0 (diff)
downloadpuppet-git-b49f04aee50d4bf0179c2fef3911e0d114d7764b.tar.gz
puppet-git-b49f04aee50d4bf0179c2fef3911e0d114d7764b.tar.bz2
Using git_server_implementation
-rw-r--r--manifests/git-manager.pp4
-rw-r--r--templates/gitweb.conf.erb2
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/git-manager.pp b/manifests/git-manager.pp
index 86ef06b..e31db0b 100644
--- a/manifests/git-manager.pp
+++ b/manifests/git-manager.pp
@@ -1,6 +1,6 @@
class git-manager {
- case $use_gitolite {
- true: {
+ case $git_server_implementation {
+ 'gitolite': {
include gitolite
}
default: {
diff --git a/templates/gitweb.conf.erb b/templates/gitweb.conf.erb
index bb96741..57f9a4b 100644
--- a/templates/gitweb.conf.erb
+++ b/templates/gitweb.conf.erb
@@ -13,7 +13,7 @@ $git_temp = "/tmp";
$home_text = "indextext.html";
# file with project list; by default, simply scan the projectroot dir.
-$projects_list = "/var/git/gitosis/projects.list";
+$projects_list = "/var/git/<%= git_server_implementation %>/projects.list";
# stylesheet to use
$stylesheet = "/gitweb.css";