summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2014-05-14 10:49:22 +0200
committerAzul <azul@riseup.net>2014-05-14 10:49:22 +0200
commit439b7c49d3de20f33ce0a61b42fedde3fc65f2eb (patch)
treebe837715d213064f10f3713eb7b939cd6bcee0b8
parentf83d6e635448d5c96be18b4d926cc99ba879bd93 (diff)
revert accidental change to webapp config template
-rw-r--r--puppet/modules/site_webapp/templates/config.yml.erb3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb
index aa8ac6ab..6461c5e8 100644
--- a/puppet/modules/site_webapp/templates/config.yml.erb
+++ b/puppet/modules/site_webapp/templates/config.yml.erb
@@ -1,3 +1,4 @@
+<%- require 'json' -%>
<%- cert_options = @webapp['client_certificates'] -%>
production:
admins: <%= @webapp['admins'].inspect %>
@@ -16,4 +17,4 @@ production:
unlimited_cert_prefix: "<%= cert_options['unlimited_prefix'] %>"
minimum_client_version: "<%= @webapp['client_version']['min'] %>"
default_service_level: "<%= @webapp['default_service_level'] %>"
- service_levels: "<%= @webapp['service_levels'].inspect %>"
+ service_levels: <%= @webapp['service_levels'].to_json %>