From b9369292cb19f97aafaaaac9f89bf2374487936b Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 18 Apr 2014 12:59:59 +0200 Subject: bring service_levels into webapp config - #5527 including the default_service_level --- puppet/modules/site_webapp/templates/config.yml.erb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'puppet/modules/site_webapp/templates/config.yml.erb') diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb index 98f8564e..aa8ac6ab 100644 --- a/puppet/modules/site_webapp/templates/config.yml.erb +++ b/puppet/modules/site_webapp/templates/config.yml.erb @@ -15,3 +15,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'].inspect %>" -- cgit v1.2.3 From de4b44f723f71aac8cab1b7480c79de0b6c24bcf Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 29 Apr 2014 14:27:27 +0200 Subject: require json so we can use it to dumpt the service levels --- puppet/modules/site_webapp/templates/config.yml.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_webapp/templates/config.yml.erb') 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 %> -- cgit v1.2.3 From f83d6e635448d5c96be18b4d926cc99ba879bd93 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 14 May 2014 10:34:45 +0200 Subject: 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. --- puppet/modules/site_webapp/templates/config.yml.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'puppet/modules/site_webapp/templates/config.yml.erb') 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 %>" -- cgit v1.2.3 From 439b7c49d3de20f33ce0a61b42fedde3fc65f2eb Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 14 May 2014 10:49:22 +0200 Subject: revert accidental change to webapp config template --- puppet/modules/site_webapp/templates/config.yml.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_webapp/templates/config.yml.erb') 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 %> -- cgit v1.2.3