diff options
| author | Olivier Blin <dev@blino.org> | 2017-04-10 16:55:02 +0200 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2017-04-10 16:57:02 +0200 |
| commit | eb5cfec6c382a50370be00df9e46a94830a0a8a1 (patch) | |
| tree | 496d442e1da0ea9b2add250002070f8092030480 /modules | |
| parent | 02ca37a63980a36c20a65548876294ae1a0850f8 (diff) | |
| download | puppet-eb5cfec6c382a50370be00df9e46a94830a0a8a1.tar puppet-eb5cfec6c382a50370be00df9e46a94830a0a8a1.tar.gz puppet-eb5cfec6c382a50370be00df9e46a94830a0a8a1.tar.bz2 puppet-eb5cfec6c382a50370be00df9e46a94830a0a8a1.tar.xz puppet-eb5cfec6c382a50370be00df9e46a94830a0a8a1.zip | |
viewvc: use fcgid
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/viewvc/manifests/init.pp | 12 | ||||
| -rw-r--r-- | modules/viewvc/templates/vhost.conf | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/modules/viewvc/manifests/init.pp b/modules/viewvc/manifests/init.pp index 2545a8b1..38cc4eae 100644 --- a/modules/viewvc/manifests/init.pp +++ b/modules/viewvc/manifests/init.pp @@ -1,5 +1,5 @@ class viewvc { - include apache::mod::fastcgi + include apache::mod::fcgid include viewvc::var package {['viewvc', 'python-svn', @@ -42,11 +42,17 @@ class viewvc { $vhost_aliases = { '/viewvc' => '/var/www/viewvc/', '/robots.txt' => $robotsfile, - '/' => '/usr/share/viewvc/bin/wsgi/viewvc.fcgi/' } + + $script_aliases = { + '/' => '/usr/share/viewvc/bin/wsgi/viewvc.fcgi/', + } + + $process = 4 + apache::vhost::base { $viewvc::var::hostname: aliases => $vhost_aliases, - content => template('viewvc/vhost.conf'), + content => template('apache/vhost_fcgid.conf'), } apache::vhost::base { "ssl_${viewvc::var::hostname}": vhost => $viewvc::var::hostname, diff --git a/modules/viewvc/templates/vhost.conf b/modules/viewvc/templates/vhost.conf deleted file mode 100644 index 28e9f3d6..00000000 --- a/modules/viewvc/templates/vhost.conf +++ /dev/null @@ -1 +0,0 @@ - FastCgiServer /usr/share/viewvc/bin/wsgi/viewvc.fcgi -processes 4 -idle-timeout 30 |