Merge pull request #75 from parallels-cookbooks/sso-databag

Allow to override SSO settings in the data bag
sous-chefs · Nov 13, 2015 · 2ab12e6 · 2ab12e6
2 parents 1378f62 + 71026d7
commit 2ab12e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/recipes/crowd_sso.rb b/recipes/crowd_sso.rb
@@ -1,13 +1,15 @@
+settings = merge_confluence_settings
+
 template "#{node['confluence']['install_path']}/confluence/WEB-INF/classes/crowd.properties" do
   source 'crowd.properties.erb'
   owner node['confluence']['user']
   group node['confluence']['user']
   mode 00644
   action :create
   variables(
-    :app_name => node['confluence']['crowd_sso']['app_name'],
-    :app_password => node['confluence']['crowd_sso']['app_password'],
-    :crowd_base_url => node['confluence']['crowd_sso']['crowd_base_url']
+    :app_name => settings['crowd_sso']['app_name'],
+    :app_password => settings['crowd_sso']['app_password'],
+    :crowd_base_url => settings['crowd_sso']['crowd_base_url']
   )
   sensitive true
   notifies :restart, 'service[confluence]', :delayed

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -24,4 +24,4 @@
 include_recipe 'confluence::configuration'
 include_recipe 'confluence::tomcat_configuration'
 include_recipe 'confluence::apache2'
-include_recipe 'confluence::crowd_sso' if node['confluence']['crowd_sso']['enabled']
+include_recipe 'confluence::crowd_sso' if settings['crowd_sso']['enabled']