opendev/puppet-gerrit
Code Issues Proposed changes

Merge "Update bouncy castle libraries for Gerrit 2.13"

Browse Source
This commit is contained in:
Jenkins
2017-04-03 21:04:09 +00:00
committed by Gerrit Code Review
parent e4de9bc101 c00f473402
commit cde8d6ec51
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/init.pp
View File

@@ -918,7 +918,7 @@ class gerrit(
# Gerrit 2.10 requires libs not available in ubuntu repositories # Gerrit 2.10 requires libs not available in ubuntu repositories
# need to download them directly from maven central. # need to download them directly from maven central.
if versioncmp($gerrit_war_version, '2.10') > 0 { if (versioncmp($gerrit_war_version, '2.10') > 0) and (versioncmp($gerrit_war_version, '2.12') < 0) {
exec { 'download bcprov-jdk15on-1.51.jar': exec { 'download bcprov-jdk15on-1.51.jar':
command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar -O /home/gerrit2/review_site/lib/bcprov-1.51.jar', command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.51/bcprov-jdk15on-1.51.jar -O /home/gerrit2/review_site/lib/bcprov-1.51.jar',
creates => '/home/gerrit2/review_site/lib/bcprov-1.51.jar', creates => '/home/gerrit2/review_site/lib/bcprov-1.51.jar',
@@ -931,6 +931,19 @@ class gerrit(
before => Exec['gerrit-start'], before => Exec['gerrit-start'],
require => File['/home/gerrit2/review_site/lib'], require => File['/home/gerrit2/review_site/lib'],
} }
} elsif (versioncmp($gerrit_war_version, '2.12') > 0) {
exec { 'download bcprov-jdk15on-1.52.jar':
command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52.jar -O /home/gerrit2/review_site/lib/bcprov-1.52.jar',
creates => '/home/gerrit2/review_site/lib/bcprov-1.52.jar',
before => Exec['gerrit-start'],
require => File['/home/gerrit2/review_site/lib'],
}
exec { 'download bcpkix-jdk15on-1.52.jar':
command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.52/bcpkix-jdk15on-1.52.jar -O /home/gerrit2/review_site/lib/bcpkix-1.52.jar',
creates => '/home/gerrit2/review_site/lib/bcpkix-1.52.jar',
before => Exec['gerrit-start'],
require => File['/home/gerrit2/review_site/lib'],
}
} else { } else {
package { 'libbcprov-java': package { 'libbcprov-java':
ensure => present, ensure => present,
@@ -965,13 +978,20 @@ class gerrit(
# Install Bouncy Castle's OpenPGP plugin and populate the contact store # Install Bouncy Castle's OpenPGP plugin and populate the contact store
# public key file if we're using that feature. # public key file if we're using that feature.
if ($contactstore == true) { if ($contactstore == true) {
if versioncmp($gerrit_war_version, '2.10') > 0 { if (versioncmp($gerrit_war_version, '2.10') > 0) and (versioncmp($gerrit_war_version, '2.12') < 0) {
exec { 'download bcpgjdk15on-1.51.jar': exec { 'download bcpgjdk15on-1.51.jar':
command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/1.51/bcpg-jdk15on-1.51.jar -O /home/gerrit2/review_site/lib/bcpg-1.51.jar', command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/1.51/bcpg-jdk15on-1.51.jar -O /home/gerrit2/review_site/lib/bcpg-1.51.jar',
creates => '/home/gerrit2/review_site/lib/bcpg-1.51.jar', creates => '/home/gerrit2/review_site/lib/bcpg-1.51.jar',
before => Exec['gerrit-start'], before => Exec['gerrit-start'],
require => File['/home/gerrit2/review_site/lib'], require => File['/home/gerrit2/review_site/lib'],
} }
} elsif (versioncmp($gerrit_war_version, '2.12') > 0) {
exec { 'download bcpgjdk15on-1.52.jar':
command => '/usr/bin/wget https://repo1.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/1.52/bcpg-jdk15on-1.52.jar -O /home/gerrit2/review_site/lib/bcpg-1.52.jar',
creates => '/home/gerrit2/review_site/lib/bcpg-1.52.jar',
before => Exec['gerrit-start'],
require => File['/home/gerrit2/review_site/lib'],
}
} else { } else {
package { 'libbcpg-java': package { 'libbcpg-java':
ensure => present, ensure => present,