diff options
| author | Olivier Blin <dev@blino.org> | 2017-04-08 02:28:05 +0200 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2017-04-08 02:28:44 +0200 |
| commit | 2b4d2336883f30c848a9cfcf346bce2aada2e3a7 (patch) | |
| tree | fcef63dad6d0889a05a515de43997b22cc79ef2d /modules/apache | |
| parent | 78b4f4c06659193c6db3e22c4ac35c0c6d32090b (diff) | |
| download | puppet-2b4d2336883f30c848a9cfcf346bce2aada2e3a7.tar puppet-2b4d2336883f30c848a9cfcf346bce2aada2e3a7.tar.gz puppet-2b4d2336883f30c848a9cfcf346bce2aada2e3a7.tar.bz2 puppet-2b4d2336883f30c848a9cfcf346bce2aada2e3a7.tar.xz puppet-2b4d2336883f30c848a9cfcf346bce2aada2e3a7.zip | |
catalyst_app: use fcgid instead of fastcgi
fastcgi is not available on Mageia 5.
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/vhost/catalyst_app.pp | 4 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_catalyst_app.conf | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/apache/manifests/vhost/catalyst_app.pp b/modules/apache/manifests/vhost/catalyst_app.pp index 11c77a8a..2dcc9471 100644 --- a/modules/apache/manifests/vhost/catalyst_app.pp +++ b/modules/apache/manifests/vhost/catalyst_app.pp @@ -4,13 +4,11 @@ define apache::vhost::catalyst_app( $script, $use_ssl = false, $aliases = {}, $vhost = false) { - include apache::mod::fastcgi + include apache::mod::fcgid if ($location) { $aliases['/static'] = "${location}/root/static" } - $aliases['/'] = "${script}/" - apache::vhost::base { $name: vhost => $vhost, use_ssl => $use_ssl, diff --git a/modules/apache/templates/vhost_catalyst_app.conf b/modules/apache/templates/vhost_catalyst_app.conf index bfe0ec19..a369f71f 100644 --- a/modules/apache/templates/vhost_catalyst_app.conf +++ b/modules/apache/templates/vhost_catalyst_app.conf @@ -1 +1,4 @@ -FastCgiServer <%= script %> -processes <%= process %> -idle-timeout 30 +SetHandler fcgid-script +ScriptAlias / <%= script %>/ +FcgidMinProcessesPerClass <%= process %> +FcgidIdleTimeout 30 |