Skip to content

Commit

Permalink
Merge pull request #107 from legal90/confl-5.9.10
Browse files Browse the repository at this point in the history
Add support of Confluence 5.9.9, 5.9.10
  • Loading branch information
legal90 committed May 6, 2016
2 parents 79b6312 + abfaca9 commit 7aebba9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -49,7 +49,7 @@ install_path | location to install Confluence | String | /opt/atlassian/confluen
install_type | Confluence install type - "installer", "standalone" | String | installer
url | URL for Confluence install | String | auto-detected by library method
user | user running Confluence | String | confluence
version | Confluence version to install | String | 5.9.5
version | Confluence version to install | String | 5.9.10

**Notice:** If `['confluence']['install_type']` is set to `installer`, then the installer will try to upgrade your Confluence instance located in `['confluence']['install_path']` (if it exists) to the `['confluence']['version']`.

Expand Down
2 changes: 1 addition & 1 deletion attributes/default.rb
Expand Up @@ -21,7 +21,7 @@
default['confluence']['install_path'] = '/opt/atlassian/confluence'
default['confluence']['install_type'] = 'installer'
default['confluence']['user'] = 'confluence'
default['confluence']['version'] = '5.9.5'
default['confluence']['version'] = '5.9.10'

# Defaults are automatically selected from version via helper functions
default['confluence']['url'] = nil
Expand Down
10 changes: 10 additions & 0 deletions libraries/helpers.rb
Expand Up @@ -301,6 +301,16 @@ def confluence_checksum_map
'x32' => 'f2f9c27e49d4d469f411b00dbcdb2c46d9ccdc714bf128690090d27f9443201b',
'x64' => '6b37adc21ea85a8e37a06d88bd3e4d32c25cce2d009f1582066e4c3ff16e61b9',
'tar' => 'bd4999df5d1bcf9aaee3b3976b10dd3bb44b50c292225b94432aa790ad7d1d13'
},
'5.9.9' => {
'x32' => '108abfe80ee2f854bd7ac6816fa6912784e40b371c4fcc472898a6c90e16e969',
'x64' => '5d13837cf16d9ca54b542d2ba5b5fc33eae734dd21e214e691490c2bb3149865',
'tar' => 'e84220e6781949aef1d2e93df5e1dd7d1c793e20099abcf0dff9c04a11686ec4'
},
'5.9.10' => {
'x32' => '11fc44e61625f151b72d16dd541c84b96f910e30f5fc51052737d41c27eb4ac9',
'x64' => 'c9edc67069ef85e8ec4fefca440dee6c61fb3f33df9d61bcad2a0def8e8d6f09',
'tar' => '99c468a765c0ba2a0fb535d87e017ccfdd5be78067370f8b34adc58acccd5bd2'
}
}
end
Expand Down

0 comments on commit 7aebba9

Please sign in to comment.