summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2014-05-14 10:34:45 +0200
committerAzul <azul@riseup.net>2014-05-14 10:39:10 +0200
commitf83d6e635448d5c96be18b4d926cc99ba879bd93 (patch)
tree51e2a5c546a00a5507fdad3447b8762aa8286c04 /puppet/modules/site_webapp
parent89fac280079e4fd1eb9a4491a06a2dd549cee32b (diff)
use hash for provider service levels
We want to access service levels by means of the id stored in the user record. With a hash we don't have to loop through all elements to find the one with a given id and still can use arbitrary strings and do not rely on the order of the array. Also it's the format the webapp is expecting right now.
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/templates/config.yml.erb3
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb
index 6461c5e8..aa8ac6ab 100644
--- a/puppet/modules/site_webapp/templates/config.yml.erb
+++ b/puppet/modules/site_webapp/templates/config.yml.erb
@@ -1,4 +1,3 @@
-<%- require 'json' -%>
<%- cert_options = @webapp['client_certificates'] -%>
production:
admins: <%= @webapp['admins'].inspect %>
@@ -17,4 +16,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'].to_json %>
+ service_levels: "<%= @webapp['service_levels'].inspect %>"