diff options
| author | Michael Scherer <misc@mageia.org> | 2011-03-08 09:30:36 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-03-08 09:30:36 +0000 |
| commit | b926df79761b21bb318197a038e9a363a76de6de (patch) | |
| tree | c42a4520fd1058171904f9295d01c636ba193add /modules/viewvc | |
| parent | 47ca5131d7e63f8e0bddde7dc93f75a7e03e3bf2 (diff) | |
| download | puppet-b926df79761b21bb318197a038e9a363a76de6de.tar puppet-b926df79761b21bb318197a038e9a363a76de6de.tar.gz puppet-b926df79761b21bb318197a038e9a363a76de6de.tar.bz2 puppet-b926df79761b21bb318197a038e9a363a76de6de.tar.xz puppet-b926df79761b21bb318197a038e9a363a76de6de.zip | |
- use fastcgi rather than wsgi, as wsgi support of viewvc leak
memory or make apache apache unable to start
Diffstat (limited to 'modules/viewvc')
| -rw-r--r-- | modules/viewvc/manifests/init.pp | 10 | ||||
| -rw-r--r-- | modules/viewvc/templates/vhost.conf | 2 |
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 + |