diff options
| author | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
| commit | 6100b6ded99241f10e7fb12c13a0820fda084912 (patch) | |
| tree | 863a9120010f32fdae304af94cd102c1da5096a6 /puppet/modules/site_webapp | |
| parent | 327d5c934e408f90011d7949b89ab01fed88998e (diff) | |
| parent | a622e49c5df2150049afb6f6ed47177537b7e6da (diff) | |
Merge branch 'develop' (0.5.1)0.5.1
Change-Id: I4e9d845f9758232f4da0d4bfbf785e52982b825b
Diffstat (limited to 'puppet/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/templates/config.yml.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 98f8564e..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 %> @@ -15,3 +16,5 @@ production: limited_cert_prefix: "<%= cert_options['limited_prefix'] %>" 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 %> |