summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-06-01 22:22:45 -0700
committerelijah <elijah@riseup.net>2014-06-02 12:03:06 -0700
commit2b3b9243e7d0301f877b35246a809c50196e038c (patch)
tree0df2bfa29f92c3fe07b1ba311f67d4e8de5f5594 /puppet
parent4e3d168d103fea6476694997275c4df4821535f3 (diff)
work around hiera's inability to escape '%' by using ':percent:'
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_static/templates/apache.conf.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_static/templates/apache.conf.erb b/puppet/modules/site_static/templates/apache.conf.erb
index b23c1bf9..a16d51f4 100644
--- a/puppet/modules/site_static/templates/apache.conf.erb
+++ b/puppet/modules/site_static/templates/apache.conf.erb
@@ -75,7 +75,7 @@
<%- end -%>
<%- if @apache_config -%>
-<%= @apache_config %>
+<%= @apache_config.gsub(':percent:','%') %>
<%- end -%>
<%- @locations && @locations.each do |name, location| -%>