diff options
Diffstat (limited to 'modules/apache/manifests/vhost/catalyst_app.pp')
| -rw-r--r-- | modules/apache/manifests/vhost/catalyst_app.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/apache/manifests/vhost/catalyst_app.pp b/modules/apache/manifests/vhost/catalyst_app.pp index 1ce40747..1faab924 100644 --- a/modules/apache/manifests/vhost/catalyst_app.pp +++ b/modules/apache/manifests/vhost/catalyst_app.pp @@ -6,7 +6,9 @@ define apache::vhost::catalyst_app( $script, $vhost = false) { include apache::mod::fcgid if ($location) { - $aliases['/static'] = "${location}/root/static" + $allaliases = merge($aliases, {'/static' => "${location}/root/static"}) + } else { + $allaliases = $aliases } $script_aliases = { @@ -17,7 +19,7 @@ define apache::vhost::catalyst_app( $script, vhost => $vhost, use_ssl => $use_ssl, content => template('apache/vhost_fcgid.conf'), - aliases => $aliases, + aliases => $allaliases, } } |