aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-07 20:08:15 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-07 20:08:15 -0200
commit6b80c659a0ec2fd8a97a0b2ce9bf9a2dec32f88c (patch)
treec197ca31536f408c650eb44737512ab311b6432b
parentfce8e055bff7252f3ea9bee65c3b894fa7fdf1ce (diff)
downloadpuppet-git-6b80c659a0ec2fd8a97a0b2ce9bf9a2dec32f88c.tar.gz
puppet-git-6b80c659a0ec2fd8a97a0b2ce9bf9a2dec32f88c.tar.bz2
Adding $apache_use_domain
-rw-r--r--manifests/gitweb.pp4
-rw-r--r--templates/gitweb.conf.erb2
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/gitweb.pp b/manifests/gitweb.pp
index d9d1b17..81d19c9 100644
--- a/manifests/gitweb.pp
+++ b/manifests/gitweb.pp
@@ -4,6 +4,10 @@ class gitweb inherits gitosis {
# the needed packages
package { gitweb: ensure => installed }
+ case $apache_use_domain {
+ '' { $apache_use_domain = $domain }
+ }
+
# gitweb config file
file { "/etc/gitweb.conf":
owner => "root",
diff --git a/templates/gitweb.conf.erb b/templates/gitweb.conf.erb
index 436c7a3..d66ac5b 100644
--- a/templates/gitweb.conf.erb
+++ b/templates/gitweb.conf.erb
@@ -25,4 +25,4 @@ $logo = "/git-logo.png";
$favicon = "/git-favicon.png";
# header url
-@git_base_url_list = ('git://git.<%= domain %>');
+@git_base_url_list = ('git://git.<%= apache_use_domain %>');