Dzahn has submitted this change and it was merged.
Change subject: Remove old ircbot and gitweb cruft
......................................................................
Remove old ircbot and gitweb cruft
Change-Id: I134fa74027f407971ef5566ac8998ecee7ecd796
---
M manifests/gerrit.pp
M manifests/role/gerrit.pp
2 files changed, 1 insertion(+), 53 deletions(-)
Approvals:
Demon: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index cf39d25..baf8806 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -3,7 +3,6 @@
class gerrit::instance($no_apache=false,
$apache_ssl=false,
- $ircbot=false,
$slave=false,
$ssh_port="29418",
$db_host="",
@@ -63,9 +62,6 @@
smtp_host => $smtp_host,
ssh_key => $ssh_key,
}
-
- # Optional modules
- if $ircbot { include gerrit::ircbot }
}
class gerrit::jetty ($ldap_hosts,
@@ -82,8 +78,7 @@
$smtp_host,
$ssh_key) {
- include gerrit::crons,
- gerrit::gitweb
+ include gerrit::crons
package { [ "openjdk-6-jre", "git-svn" ]:
ensure => latest;
@@ -159,8 +154,6 @@
group => gerrit2,
mode => 0444,
require => File["/var/lib/gerrit2/review_site/etc"];
- "/var/lib/gerrit2/review_site/etc/hookconfig.py":
- ensure => absent;
"/var/lib/gerrit2/review_site/etc/mail/ChangeSubject.vm":
owner => gerrit2,
group => gerrit2,
@@ -217,20 +210,6 @@
mode => 0755,
ensure => directory,
require => Exec["install_gerrit_jetty"];
- "/var/lib/gerrit2/review_site/hooks/change-abandoned":
- ensure => absent;
- "/var/lib/gerrit2/review_site/hooks/hookhelper.py":
- ensure => absent;
- "/var/lib/gerrit2/review_site/hooks/change-merged":
- ensure => absent;
- "/var/lib/gerrit2/review_site/hooks/change-restored":
- ensure => absent;
- "/var/lib/gerrit2/review_site/hooks/comment-added":
- ensure => absent;
- "/var/lib/gerrit2/review_site/hooks/patchset-created":
- ensure => absent;
- "/var/lib/gerrit2/review_site/hooks/draft-published":
- ensure => absent;
}
git::clone {
@@ -299,35 +278,6 @@
apache_module { proxy: name => "proxy" }
apache_module { proxy_http: name => "proxy_http" }
apache_module { ssl: name => "ssl" }
-}
-
-class gerrit::gitweb {
- package { [ "gitweb" ]:
- ensure => absent;
- }
-
- file {
- "/etc/apache2/conf.d/gitweb":
- ensure => absent;
- "/var/lib/gerrit2/review_site/etc/gitweb_config.perl":
- ensure => absent;
- }
-}
-
-class gerrit::ircbot {
- package { ['ircecho']:
- ensure => absent;
- }
-
- service { ['ircecho']:
- enable => false,
- ensure => stopped;
- }
-
- file {
- "/etc/default/ircecho":
- ensure => absent;
- }
}
class gerrit::crons {
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index a21d41a..0bdda4d 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -5,7 +5,6 @@
system_role { 'role::gerrit::labs': description => 'Gerrit in
labs!' }
class { 'gerrit::instance':
- ircbot => false,
db_host => 'gerrit-db',
host => 'gerrit-dev.wmflabs.org',
ssh_key =>
'AAAAB3NzaC1yc2EAAAADAQABAAABAQDIb6jbDSyzSD/Pw8PfERVKtNkXgUteOTmZJjHtbOjuoC7Ty6dbvUMX+45GedcD1wAYkWEY26RhI1lW2yEwKvh7VWkKixXqPNyrQGvI+ldjYEyWsGlEHCNqsh37mJD5K3cwr7X/PMaxzxh7rjTk4uRKjtiga9bz1vTDRDaNlXcj84kifsu7xmCY1E+OL4oqqy7b3SKhOpcpZc7n5GonfRSeon5uFHVUjoZ57xQ8x2736zbuLBwMRKtaB+V63cU9ArL90XdVrWfbjI4Fzfex4tBG9fOvt8lINR62cjH5Lova2kZ6VBeUnJYdZ8V1mOSwtITjwkE0K98FNZdqaANZAH7V',
@@ -19,7 +18,6 @@
system_role { 'role::gerrit::production': description =>
'Gerrit master' }
class { "gerrit::instance":
- ircbot => true,
db_host => 'db1048.eqiad.wmnet',
host => 'gerrit.wikimedia.org',
ssh_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==',
--
To view, visit https://gerrit.wikimedia.org/r/79968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I134fa74027f407971ef5566ac8998ecee7ecd796
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
