diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2014-04-04 13:48:09 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2014-04-04 13:48:09 +0000 |
| commit | 56399cc179ae5f58f621f9f467cc8e4ed608e64f (patch) | |
| tree | 688fcb4164dee28aab662a87348fcaa40ff4962a /modules/apache | |
| parent | 7592a564535539f79cf1bfce95d8450e6d0a4cca (diff) | |
| download | puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar.gz puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar.bz2 puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.tar.xz puppet-56399cc179ae5f58f621f9f467cc8e4ed608e64f.zip | |
Don't use merge, it's not a standard function
Diffstat (limited to 'modules/apache')
| -rw-r--r-- | modules/apache/manifests/vhost/catalyst_app.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/apache/manifests/vhost/catalyst_app.pp b/modules/apache/manifests/vhost/catalyst_app.pp index 3540a9c7..b86cf27e 100644 --- a/modules/apache/manifests/vhost/catalyst_app.pp +++ b/modules/apache/manifests/vhost/catalyst_app.pp @@ -6,10 +6,10 @@ define apache::vhost::catalyst_app( $script, $vhost = false) { include apache::mod::fastcgi if ($location) { - $aliases = merge($aliases, {'/static' => "$location/root/static"}) + $aliases['/static'] = "$location/root/static" } - $aliases = merge($aliases, {'/' => $script}) + $aliases['/'] = $script apache::vhost::base { $name: vhost => $vhost, |