diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-08 00:18:44 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-08 00:18:44 +0000 |
| commit | 3ca1def40707b874bd1736327b700ff897a0fe33 (patch) | |
| tree | d32c60f758a8cb8e96eba3ba7b5cc72e1033af61 /modules/apache | |
| parent | 0d62c2499235a5e3788972a24e82b0adc25df6a7 (diff) | |
| download | puppet-3ca1def40707b874bd1736327b700ff897a0fe33.tar puppet-3ca1def40707b874bd1736327b700ff897a0fe33.tar.gz puppet-3ca1def40707b874bd1736327b700ff897a0fe33.tar.bz2 puppet-3ca1def40707b874bd1736327b700ff897a0fe33.tar.xz puppet-3ca1def40707b874bd1736327b700ff897a0fe33.zip | |
- add a hook to serve static file with apache directly
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/apache/templates/vhost_catalyst_app.conf | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index fefe5a78..e89242f7 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -82,7 +82,7 @@ class apache { } } - define vhost_catalyst_app($script, $process = 4, $use_ssl = false) { + define vhost_catalyst_app($script, $location = '', $process = 4, $use_ssl = false) { include apache::mod_fastcgi diff --git a/modules/apache/templates/vhost_catalyst_app.conf b/modules/apache/templates/vhost_catalyst_app.conf index 254801aa..a3aee804 100644 --- a/modules/apache/templates/vhost_catalyst_app.conf +++ b/modules/apache/templates/vhost_catalyst_app.conf @@ -2,7 +2,9 @@ ServerName <%= name %> # Serve static content directly DocumentRoot /dev/null - +<% if location then %> + Alias /static <%= location %>/root/static +<% endif %> Alias / <%= script %>/ FastCgiServer <%= script %> -processes <%= process %> -idle-timeout 30 |