aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-03-08 10:17:37 +0000
committerMichael Scherer <misc@mageia.org>2011-03-08 10:17:37 +0000
commit8d018927b5268513d15479cb97a83103d2566882 (patch)
tree69a680a4ef33b5d0bfab7e12774780b353726f89
parenta4008b70815347e42a96482cc4f54d671f68f28d (diff)
downloadpuppet-8d018927b5268513d15479cb97a83103d2566882.tar
puppet-8d018927b5268513d15479cb97a83103d2566882.tar.gz
puppet-8d018927b5268513d15479cb97a83103d2566882.tar.bz2
puppet-8d018927b5268513d15479cb97a83103d2566882.tar.xz
puppet-8d018927b5268513d15479cb97a83103d2566882.zip
- alias should be ordered, more specific first, or the more general will
mask the more specific alias ( apache warn about this ). Hashes in puppet are not sorted.
-rw-r--r--modules/apache/templates/vhost_base.conf6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/apache/templates/vhost_base.conf b/modules/apache/templates/vhost_base.conf
index 4d3def50..3baa6817 100644
--- a/modules/apache/templates/vhost_base.conf
+++ b/modules/apache/templates/vhost_base.conf
@@ -32,9 +32,11 @@ end
UserDir disabled
</IfModule>
<%- end -%>
-<%- aliases.each_pair do |key,value| -%>
- Alias <%= key %> <%= value %>
+
+<%- aliases.keys.sort {|a,b| a.size <=> b.size }.reverse.each do |key| -%>
+ Alias <%= key %> <%= aliases[key] %>
<%- end -%>
+
<%= content %>
<Location />