Skip to content

Commit

Permalink
Merge pull request #183 from sacres/archive_default
Browse files Browse the repository at this point in the history
Atlassian doesn't provide checksums, add checksum_verify false.
  • Loading branch information
bastelfreak committed Nov 23, 2016
2 parents 8da6258 + 666232c commit 489316f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,8 @@ The jira::facts class is required for upgrades.

##### Upgrades to the JIRA puppet Module

mkrakowitzer-deploy has been replaced with nanliu-staging as the default module for
deploying the JIRA binaries. You can still use mkrakowitzer-deploy with the
*deploy_module => 'archive'*
puppet-archive is the default module for
deploying the JIRA binaries.

```puppet
class { 'jira':
Expand Down
1 change: 1 addition & 0 deletions manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
source => "${jira::download_url}/${file}",
creates => "${jira::webappdir}/conf",
cleanup => true,
checksum_verify => false,
checksum_type => 'md5',
checksum => $jira::checksum,
user => $jira::user,
Expand Down
14 changes: 7 additions & 7 deletions spec/classes/jira_install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
let(:params) do
{
javahome: '/opt/java',
version: '6.0.0',
version: '6.1',
format: 'tar.gz',
installdir: '/opt/jira',
homedir: '/random/homedir',
Expand All @@ -98,7 +98,7 @@
uid: 333,
gid: 444,
shell: '/bin/bash',
download_url: 'http://downloads.atlassian.com'
download_url: 'https://www.atlassian.com/software/jira/downloads/binary'
}
end

Expand All @@ -110,11 +110,11 @@
end
it { is_expected.to contain_group('bar') }

it 'deploys jira 6.0.0 from tar.gz' do
is_expected.to contain_archive('/tmp/atlassian-jira-6.0.0.tar.gz').
with('extract_path' => '/opt/jira/atlassian-jira-6.0.0-standalone',
'source' => 'http://downloads.atlassian.com/atlassian-jira-6.0.0.tar.gz',
'creates' => '/opt/jira/atlassian-jira-6.0.0-standalone/conf',
it 'deploys jira 6.1 from tar.gz' do
is_expected.to contain_archive('/tmp/atlassian-jira-6.1.tar.gz').
with('extract_path' => '/opt/jira/atlassian-jira-6.1-standalone',
'source' => 'https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-6.1.tar.gz',
'creates' => '/opt/jira/atlassian-jira-6.1-standalone/conf',
'user' => 'foo',
'group' => 'bar',
'checksum_type' => 'md5')
Expand Down

0 comments on commit 489316f

Please sign in to comment.