diff --git a/README.md b/README.md index 27b3c3a1..6ce35916 100644 --- a/README.md +++ b/README.md @@ -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': diff --git a/manifests/install.pp b/manifests/install.pp index 7387f141..65f5de27 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -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, diff --git a/spec/classes/jira_install_spec.rb b/spec/classes/jira_install_spec.rb index e925d9ca..ee250f66 100644 --- a/spec/classes/jira_install_spec.rb +++ b/spec/classes/jira_install_spec.rb @@ -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', @@ -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 @@ -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')