Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/156213
Change subject: Gerrit: Remove no_apache parameter, unused
......................................................................
Gerrit: Remove no_apache parameter, unused
Change-Id: Ib855ee202501cb01759bc661f43e8356e753b510
---
M manifests/gerrit.pp
1 file changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/156213/1
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index d4cc0f1..ccab5dc 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -1,8 +1,7 @@
# manifests/gerrit.pp
# Manifest to setup a Gerrit instance
-class gerrit::instance($no_apache=false,
- $apache_ssl = false,
+class gerrit::instance($apache_ssl = false,
$slave = false,
$ssh_port = '29418',
$db_host = '',
@@ -42,7 +41,6 @@
$url = "https://${host}/r";
class { 'gerrit::proxy':
- no_apache => $no_apache,
ssl_cert => $ssl_cert,
ssl_cert_key => $ssl_cert_key,
host => $host
@@ -286,14 +284,11 @@
}
}
-class gerrit::proxy( $no_apache = true,
- $host = '',
+class gerrit::proxy($host = '',
$ssl_cert = '',
$ssl_cert_key= '') {
- if !$no_apache {
- require webserver::apache
- }
+ require webserver::apache
file { '/etc/apache2/sites-enabled/gerrit.wikimedia.org':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/156213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib855ee202501cb01759bc661f43e8356e753b510
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
