Merge pull request #46 from ramonskie/master

the ability to set all property values instead of only the plugins
bflad · Jan 24, 2015 · 7869c57 · 7869c57
2 parents f2728a2 + 0971fd8
commit 7869c57
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -175,6 +175,7 @@
 default['stash']['jvm']['support_args']    = ''
 
 default['stash']['plugin'] = {}
+default['stash']['properties'] = {}
 
 default['stash']['ssh']['hostname'] = node['fqdn']
 default['stash']['ssh']['port']     = '7999'

diff --git a/recipes/configuration.rb b/recipes/configuration.rb
@@ -21,8 +21,9 @@
   owner node['stash']['user']
   mode '0644'
   variables(
-      :database => settings['database'],
-      :plugin   => settings['plugin']
+      :database   => settings['database'],
+      :plugin     => settings['plugin'],
+      :properties => settings['properties']
   )
   notifies :restart, 'service[stash]', :delayed
 end
diff --git a/templates/default/stash-config.properties.erb b/templates/default/stash-config.properties.erb
@@ -27,3 +27,9 @@ jdbc.password=<%= @database['password'] %>
 plugin.<%= key %>=<%= value %>
 <% end -%>
 <% end -%>
+
+<% if @properties -%>
+<% @properties.each do |key, value| -%>
+<%= key %>=<%= value %>
+<% end -%>
+<% end -%>