diff --git a/manifests/logserver.pp b/manifests/logserver.pp index e3f2b61..3968d44 100644 --- a/manifests/logserver.pp +++ b/manifests/logserver.pp @@ -24,7 +24,7 @@ class openstackci::logserver ( $swift_tenant_name = '', $swift_region_name = '', $swift_default_container = '', - $readmes = [], + $readmes = {}, ) { if ! defined(Class['::jenkins::jenkinsuser']) { diff --git a/templates/logs-dev.vhost.erb b/templates/logs-dev.vhost.erb index 6a0ef77..c1bee0b 100644 --- a/templates/logs-dev.vhost.erb +++ b/templates/logs-dev.vhost.erb @@ -53,9 +53,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> Satisfy Any -<% @readmes.each do |pattern| -%> +<% @readmes.each do |pattern, helpfile| -%> <%= pattern %>> - ReadmeName <%= @readmes[pattern] %> + ReadmeName <%= helpfile %> <% end -%> diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb index bb5e846..436fc82 100644 --- a/templates/logs.vhost.erb +++ b/templates/logs.vhost.erb @@ -67,9 +67,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> Satisfy Any -<% @readmes.each do |pattern| -%> +<% @readmes.each do |pattern, helpfile| -%> <%= pattern %>> - ReadmeName <%= @readmes[pattern] %> + ReadmeName <%= helpfile %> <% end -%>