Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385100 )
Change subject: Gerrit: stop installing deb package, replace with scap requires
......................................................................
Gerrit: stop installing deb package, replace with scap requires
Not needed anymore.
This just prevents the package from being install.
Needs to be removed locally.
Bug: T157414
Change-Id: Ib591ce443d7b5eef247340e52d66c10e4adb3289
---
M modules/gerrit/manifests/jetty.pp
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index d26361b..aa3e1c2 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -63,7 +63,6 @@
require_package([
'openjdk-8-jdk',
- 'gerrit',
'libbcprov-java',
'libbcpkix-java',
'libmysql-java',
@@ -101,8 +100,8 @@
file { '/var/lib/gerrit2/':
ensure => directory,
mode => '0755',
+ require => Scap::Target['gerrit/gerrit'],
owner => 'gerrit2',
- require => Package['gerrit'],
}
file { '/var/lib/gerrit2/gerrit.war':
@@ -162,7 +161,7 @@
owner => 'gerrit2',
group => 'gerrit2',
mode => '0644',
- require => [File['/var/lib/gerrit2'],Package['gerrit']],
+ require => File['/var/lib/gerrit2'],
}
file { '/var/lib/gerrit2/review_site/lib':
@@ -170,7 +169,7 @@
owner => 'gerrit2',
group => 'gerrit2',
mode => '0555',
- require => [File['/var/lib/gerrit2/review_site'],Package['gerrit']],
+ require => File['/var/lib/gerrit2/review_site'],
}
file { '/var/lib/gerrit2/review_site/lib/bcprov-1.49.jar':
--
To view, visit https://gerrit.wikimedia.org/r/385100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib591ce443d7b5eef247340e52d66c10e4adb3289
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
