aboutsummaryrefslogtreecommitdiffstats
path: root/modules/viewvc
diff options
context:
space:
mode:
Diffstat (limited to 'modules/viewvc')
-rw-r--r--modules/viewvc/manifests/init.pp10
-rw-r--r--modules/viewvc/templates/vhost.conf2
2 files changed, 7 insertions, 5 deletions
diff --git a/modules/viewvc/manifests/init.pp b/modules/viewvc/manifests/init.pp
index 55d36842..a97c67f8 100644
--- a/modules/viewvc/manifests/init.pp
+++ b/modules/viewvc/manifests/init.pp
@@ -21,11 +21,11 @@ class viewvc {
}
# need newer version of viewvc
- apache::vhost_wsgi{ "svnweb.$domain":
- # remove this alias in mars 2011
- server_aliases => "viewvc.$domain",
- wsgi_path => "/usr/share/viewvc/bin/wsgi/viewvc.wsgi",
- aliases => { "/viewvc" => "/var/www/viewvc/" },
+ apache::vhost_base { "svnweb.$domain":
+ # TODO created a full fledged type
+ aliases => { "/viewvc" => "/var/www/viewvc/",
+ "/" => "/usr/share/viewvc/bin/wsgi/viewvc.fcgi/" },
+ content => template("viewvc/vhost.conf")
}
}
diff --git a/modules/viewvc/templates/vhost.conf b/modules/viewvc/templates/vhost.conf
new file mode 100644
index 00000000..28916f98
--- /dev/null
+++ b/modules/viewvc/templates/vhost.conf
@@ -0,0 +1,2 @@
+ FastCgiServer /usr/share/viewvc/bin/wsgi/viewvc.fcgi -processes 4 -idle-timeout 30
+