Merge pull request #154 from linc01n/stash_version/4.6.0

Update bitbucket to 4.6.0 and backup client to 3.2.0

README.md

@@ -54,7 +54,7 @@ install_type | Stash install type - "standalone" only for now | String | standal
 url_base | URL base for Stash install | String | http://www.atlassian.com/software/stash/downloads/binary/atlassian-stash
 url | URL for Stash install | String | auto-detected (see attributes/default.rb)
 user | user to run Stash | String | stash
-version | Stash version to install | String | 4.5.2
+version | Stash version to install | String | 4.6.0
 
 ### Stash Backup Attributes (Shared)
 
@@ -78,7 +78,7 @@ Attribute | Description | Type | Default
 checksum | SHA256 checksum for Stash Backup Client install | String | auto-detected (see attributes/default.rb)
 install_path | location to install Stash Backup Client | String | /opt/atlassian/stash-backup-client
 url_base | URL base for Stash Backup Client install | String | http://downloads.atlassian.com/software/stash/downloads/stash-backup-distribution
-version | Stash Backup Client version to install | String | 3.1.0
+version | Stash Backup Client version to install | String | 3.2.0
 
 ### Stash DIY Backup Attributes
 Documentation: [Using Stash DIY Backup](https://confluence.atlassian.com/display/STASH/Using+Stash+DIY+Backup)

attributes/default.rb

@@ -1,6 +1,6 @@
 set['build-essential']['compile_time'] = true
 
-default['stash']['version']      = '4.5.2'
+default['stash']['version']      = '4.6.0'
 default['stash']['product']      = Chef::Version.new(node['stash']['version']) >= Chef::Version.new('4.0.0') ? 'bitbucket' : 'stash'
 
 default['stash']['home_path'] = if Dir.exist?('/var/atlassian/application-data/stash')
@@ -155,6 +155,7 @@
   when '4.4.2' then '050e31d88da4cfd6715834fc5a48ec8977f461f0fac7899c602a75e251952be4'
   when '4.5.1' then 'eb93ede7c4bcaded79540f555062d9f1e79ab0da1615feca1e679cd7094eecd5'
   when '4.5.2' then 'cb3ee49ec20cd2f496dfbf0b8542a24c8db720226e3d80510b9fb4921968f89d'
+  when '4.6.0' then '7dd309b5d17be41e3e2406276e14436136f9fd810655ceed6e08a72556e644aa'
   end
 
 # Data bag where credentials and other sensitive data could be stored (optional)
@@ -196,7 +197,7 @@
 default['stash']['backup']['cron']['weekday'] = '*'
 
 default['stash']['backup_client']['install_path'] = node['stash']['install_path']
-default['stash']['backup_client']['version']      = '3.1.0'
+default['stash']['backup_client']['version']      = '3.2.0'
 stash_backup_client_version = Chef::Version.new(node['stash']['backup_client']['version'])
 
 default['stash']['backup_client']['url_base'] =
@@ -240,6 +241,7 @@
   when '2.0.2' then 'c008bfdac59b45d8ce98ec0625e69316b3a5c51ccefa18363322df687d2c78c4'
   when '3.0.0' then '1a4dcea8fa5df919b9c92341b1a3b92aed5892022e0f94733540d1ebb88653df'
   when '3.1.0' then '7d586c65f6f0173c064e5d6508c380192c4a9ac3fc2314fbc3fce2e8f6b10daf'
+  when '3.2.0' then 'e306e5d0b1f7bc36124ef2877df608b9c1fa2fb7e88d5252fc7dba680962b882'
   end
 
 default['stash']['backup_diy']['install_path'] = "#{node['stash']['install_path']}/stash-diy-backup"

libraries/stash.rb

@@ -9,7 +9,8 @@ def merge_stash_settings
       @settings_from_data_bag ||= settings_from_data_bag
       settings = Chef::Mixin::DeepMerge.deep_merge(
         @settings_from_data_bag,
-        node['stash'].to_hash)
+        node['stash'].to_hash
+      )
 
       settings['database']['port'] ||=
         case settings['database']['type']