Ryan Lane has submitted this change and it was merged.

Change subject: Kill current gerrit-wm since gerrit-wm's replacement is ready
......................................................................


Kill current gerrit-wm since gerrit-wm's replacement is ready

Change-Id: Ic0a90e1bb824f71944f8ab2f2410aed10360cf56
---
D files/gerrit/hooks/change-abandoned
D files/gerrit/hooks/change-merged
D files/gerrit/hooks/change-restored
D files/gerrit/hooks/comment-added
D files/gerrit/hooks/draft-published
D files/gerrit/hooks/generatehookconfig.rb
D files/gerrit/hooks/hookhelper.py
D files/gerrit/hooks/hookhelper_test.py
D files/gerrit/hooks/patchset-created
M manifests/gerrit.pp
D templates/gerrit/hookconfig.py.erb
11 files changed, 12 insertions(+), 596 deletions(-)

Approvals:
  Ryan Lane: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/gerrit/hooks/change-abandoned 
b/files/gerrit/hooks/change-abandoned
deleted file mode 100755
index b542c62..0000000
--- a/files/gerrit/hooks/change-abandoned
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-import re
-import sys
-from hookhelper import HookHelper
-sys.path.append('/var/lib/gerrit2/review_site/etc')
-
-
-class ChangeAbandoned(HookHelper):
-    def run(self):
-        self.parser.set_usage("change-abandoned --change <change id> 
--change-url <change url> --project <project name> --branch <branch> 
--abandoner <abandoner> --reason <reason>")
-        self.parser.add_option("--abandoner", dest="abandoner")
-        self.parser.add_option("--reason", dest="reason")
-        self.parser.add_option("--topic", dest="topic")
-        (options, args) = self.parser.parse_args()
-        reason = options.reason.splitlines()
-        if reason:
-            reason = reason[0]
-            if len(reason) > 103:
-                reason = reason[0:100] + "..."
-        else:
-            reason = "(no reason)"
-        user = re.sub(' \(.*', "", options.abandoner)
-        message = "Change abandoned: " + user + '; "' + reason + '" [' + 
options.project + "] (" + options.branch + ") - " + options.changeurl + "\n"
-        self.log_to_file(options.project, options.branch, message, user)
-
-if __name__ == "__main__":
-    hook = ChangeAbandoned()
-    hook.run()
diff --git a/files/gerrit/hooks/change-merged b/files/gerrit/hooks/change-merged
deleted file mode 100755
index 2a9df92..0000000
--- a/files/gerrit/hooks/change-merged
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/python
-import re
-import sys
-from hookhelper import HookHelper
-sys.path.append('/var/lib/gerrit2/review_site/etc')
-
-
-class ChangeMerged(HookHelper):
-    def run(self):
-        self.parser.set_usage("change-merged --change <change id> --change-url 
<change url> --project <project name> --branch <branch> --submitter <submitter> 
--commit <commit> --uploader <uploader>")
-        self.parser.add_option("--submitter", dest="submitter")
-        self.parser.add_option("--commit", dest="commit")
-        self.parser.add_option("--uploader", dest="uploader")
-        self.parser.add_option("--topic", dest="topic")
-        (options, args) = self.parser.parse_args()
-        user = re.sub(' \(.*', "", options.submitter)
-        message = "Change merged: " + user + '; [' + options.project + "] (" + 
options.branch + ") - " + options.changeurl + "\n"
-        self.log_to_file(options.project, options.branch, message, user)
-
-if __name__ == "__main__":
-    hook = ChangeMerged()
-    hook.run()
diff --git a/files/gerrit/hooks/change-restored 
b/files/gerrit/hooks/change-restored
deleted file mode 100755
index 9a9af23..0000000
--- a/files/gerrit/hooks/change-restored
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-import re
-import sys
-from hookhelper import HookHelper
-sys.path.append('/var/lib/gerrit2/review_site/etc')
-
-
-class ChangeRestored(HookHelper):
-    def run(self):
-        self.parser.set_usage("change-restored --change <change id> 
--change-url <change url> --project <project name> --branch <branch> --restorer 
<restorer> --reason <reason>")
-        self.parser.add_option("--restorer", dest="restorer")
-        self.parser.add_option("--reason", dest="reason")
-        self.parser.add_option("--topic", dest="topic")
-        (options, args) = self.parser.parse_args()
-        reason = options.reason.splitlines()
-        if reason:
-            reason = reason[0]
-            if len(reason) > 103:
-                reason = reason[0:100] + "..."
-        else:
-            reason = "(no reason)"
-        user = re.sub(' \(.*', "", options.restorer)
-        message = "Change restored: " + user + '; "' + reason + '" [' + 
options.project + "] (" + options.branch + ") - " + options.changeurl + "\n"
-        self.log_to_file(options.project, options.branch, message, user)
-
-if __name__ == "__main__":
-    hook = ChangeRestored()
-    hook.run()
diff --git a/files/gerrit/hooks/comment-added b/files/gerrit/hooks/comment-added
deleted file mode 100755
index fbc9cab..0000000
--- a/files/gerrit/hooks/comment-added
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/python
-import re
-import sys
-from hookhelper import HookHelper
-sys.path.append('/var/lib/gerrit2/review_site/etc')
-import hookconfig
-
-
-class CommentAdded(HookHelper):
-    def run(self):
-        self.parser.set_usage("comment-added --change <change id> --project 
<project name> --branch <branch> --author <comment author> --uploader 
<uploader> --commit <commit> --comment <comment> [--<approval category id> 
<score> --<approval category id> <score> ...]")
-        self.parser.add_option("--author", dest="author")
-        self.parser.add_option("--uploader", dest="uploader")
-        self.parser.add_option("--commit", dest="commit")
-        self.parser.add_option("--comment", dest="comment")
-        self.parser.add_option("--topic", dest="topic")
-        self.parser.add_option("--Verified", dest="verified")
-        self.parser.add_option("--Code-Review", dest="codereview")
-        self.parser.add_option("--is-draft", dest="draft")
-        (options, args) = self.parser.parse_args()
-        if options.draft == "true":
-            return  # Don't report drafts to IRC!
-        comment = re.sub(r"^\s*Patch Set \d+:.*$", '', options.comment, 
flags=re.MULTILINE)
-        comment = re.sub(r"^\s*\(\d+ comments\).*$", '', comment, 
flags=re.MULTILINE).strip().splitlines()
-        if comment:
-            comment = comment[0]
-            if len(comment) > 103:
-                comment = comment[0:100] + "..."
-        else:
-            return
-        review = ""
-        if options.verified:
-            review = review + "; V: " + options.verified
-        if options.codereview:
-            review = review + " C: " + options.codereview + "; "
-        user = re.sub(' \(.*', "", options.author)
-        # These users are annoying, ignore them
-        if user in hookconfig.spammyusers:
-            return
-        message = "New review: " + user + '; "' + comment + '" [' + 
options.project + "] (" + options.branch + ")" + review + " - " + 
options.changeurl + "\n"
-        self.log_to_file(options.project, options.branch, message, user)
-
-if __name__ == "__main__":
-    hook = CommentAdded()
-    hook.run()
diff --git a/files/gerrit/hooks/draft-published 
b/files/gerrit/hooks/draft-published
deleted file mode 100755
index 11d72ae..0000000
--- a/files/gerrit/hooks/draft-published
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-import sys
-import re
-from hookhelper import HookHelper
-
-sys.path.append('/var/lib/gerrit2/review_site/etc')
-import hookconfig
-
-
-class DraftPublished(HookHelper):
-    def run(self):
-        self.parser.set_usage("patchset-created --change")
-        self.parser.add_option("--uploader", dest="uploader")
-        self.parser.add_option("--commit", dest="commit")
-        self.parser.add_option("--patchset", dest="patchset", type="int")
-        self.parser.add_option("--topic", dest="topic")
-        (options, args) = self.parser.parse_args()
-        if not options.change or not options.change.isalnum():
-            self.parser.error("No change id, or changeid invalid")
-        if hookconfig.debug:
-            sys.stderr.write("Patchset passed in: " + str(options.patchset) + 
"\n")
-        subject = self.get_subject(options.change)
-        user = re.sub(' \(.*', "", options.uploader)
-        message = "Published patchset: " + user + '; "' + subject + '" [' + 
options.project + "] (" + options.branch + ") - " + options.changeurl + "\n"
-        self.log_to_file(options.project, options.branch, message, user)
-
-if __name__ == '__main__':
-    hook = DraftPublished()
-    hook.run()
diff --git a/files/gerrit/hooks/generatehookconfig.rb 
b/files/gerrit/hooks/generatehookconfig.rb
deleted file mode 100755
index 7e77f94..0000000
--- a/files/gerrit/hooks/generatehookconfig.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Sample script to expand the Gerrit hookconfig.py template. The resulting
-# expansion is simply printed to STDOUT.
-#
-# Script is used by hookhelper_test.py to create the 'hookconfig' python module
-#
-
-# Parameters for hookconfig unit testing
-gerrit_pass = "secretpassword"
-hostname    = "hostname.ssh.example.net"
-sshport     = "7777"
-
-# Expand the hookconfig.py.erb templates using the parameter defined above
-require 'erb'
-template = ERB.new( File.read("../../../templates/gerrit/hookconfig.py.erb") );
-
-# Print expanded template to standard output
-puts template.result;
diff --git a/files/gerrit/hooks/hookhelper.py b/files/gerrit/hooks/hookhelper.py
deleted file mode 100644
index 430375f..0000000
--- a/files/gerrit/hooks/hookhelper.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/python
-import sys
-import re
-import paramiko
-import socket
-import json
-import traceback
-
-from optparse import OptionParser
-
-sys.path.append('/var/lib/gerrit2/review_site/etc')
-import hookconfig
-
-
-class HookHelper:
-    def __init__(self):
-        self.patchsets = {}
-        self.parser = OptionParser(conflict_handler="resolve")
-        self.add_default_options()
-
-    def add_default_options(self):
-        self.parser.add_option("--change", dest="change")
-        self.parser.add_option("--change-url", dest="changeurl")
-        self.parser.add_option("--project", dest="project")
-        self.parser.add_option("--branch", dest="branch")
-
-    def ssh_exec_command(self, command):
-        ssh = paramiko.SSHClient()
-        ssh.load_host_keys(hookconfig.sshhostkeys)
-        try:
-            ssh.connect(hookconfig.sshhost,
-                        hookconfig.sshport, hookconfig.gerrituser,
-                        key_filename=hookconfig.sshkey)
-            stdin, stdout, stderr = ssh.exec_command(command)
-            out = stdout.readlines()
-            err = stderr.readlines()
-            ssh.close()
-            return (out, err)
-        except (paramiko.SSHException, socket.error):
-            sys.stderr.write("Failed to connect to %s." % hookconfig.sshhost)
-            traceback.print_exc(file=sys.stderr)
-            return (None, None)
-
-    def get_patchsets(self, change):
-        command = 'gerrit query --format=JSON --patch-sets ' + change
-        queryresult, err = self.ssh_exec_command(command)
-        if not queryresult:
-            sys.stderr.write("Couldn't find patchset for change: " +
-                             change + "\n")
-            return False
-        try:
-            self.patchsets[change] = json.loads(queryresult[0])
-            return True
-        except Exception:
-            sys.stderr.write("Couldn't load patchset json for change: " +
-                             change + "\n")
-            traceback.print_exc(file=sys.stderr)
-            return False
-
-    def get_subject(self, change):
-        if change not in self.patchsets:
-            patchsets_fetched = self.get_patchsets(change)
-            if not patchsets_fetched:
-                return None
-        if "subject" in self.patchsets[change].keys():
-            subject = str(self.patchsets[change]['subject'])
-            if not subject:
-                subject = "(no subject)"
-        else:
-            subject = "(no subject)"
-        return subject
-
-    def log_to_file(self, project, branch, message, user):
-        filename = self.get_log_filename(project, branch, message)
-        # These users are REALLY annoying, ignore them
-        if user in hookconfig.reallyspammyusers:
-            return
-        f = open(filename, 'a')
-        f.write(message)
-        f.close()
-
-    def get_log_filename(self, project, branch, message):
-        filename = None
-        foundproject = None
-        if hookconfig.logdir and hookconfig.logdir[-1] == '/':
-            hookconfig.logdir = hookconfig.logdir[0:-1]
-        if project in hookconfig.filenames:
-            foundproject = project
-        if foundproject is None:
-            # Attempt to use the wildcard filters
-            for filter, value in hookconfig.filenames.iteritems():
-                if not "*" in filter:
-                    # It is a project name, not a filter!
-                    continue
-                # Replace wildcard with a proper regex snippet
-                pattern = re.compile(filter.replace('*', '.+'))
-                if(pattern.match(project)):
-                    foundproject = filter
-                    break
-        if foundproject is None:
-            foundproject = 'default'
-        if branch not in hookconfig.filenames[foundproject]:
-            branch = 'default'
-        if branch in hookconfig.filenames[foundproject]:
-            filename = hookconfig.filenames[foundproject][branch]
-        else:
-            # Direct assignement such as 'default': 'wikimedia-dev.log'
-            filename = hookconfig.filenames[foundproject]
-        return hookconfig.logdir + "/" + filename
diff --git a/files/gerrit/hooks/hookhelper_test.py 
b/files/gerrit/hooks/hookhelper_test.py
deleted file mode 100644
index 961b461..0000000
--- a/files/gerrit/hooks/hookhelper_test.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# Python testing module:
-import unittest
-
-# Interpret the 'templates/gerrit/hookconfig.py.erb' template to generate
-# a local 'hookconfig' python module with variables filled with test data.
-# We shell out to ruby since there is no easy way to expand an erb template
-# using python.
-import os
-ruby_exit_code = os.system("./generatehookconfig.rb > hookconfig.py")
-if ruby_exit_code != 0:
-    import sys
-    sys.exit("Could not execute generatehookconfig.rb")
-
-# Class we are going to test:
-from hookhelper import HookHelper
-# Config need to be global in the test suite too:
-import hookconfig
-
-helper = HookHelper()
-
-
-class TestLogToFile(unittest.TestCase):
-    def assertLogFile(self, filename, project, branch='master'):
-
-        # Ask helper to provide us with the full filename
-        actual = helper.get_log_filename(project, branch, '')
-        # and now get ride of the common long directory
-        actual = actual.replace(hookconfig.logdir + "/", '')
-
-        self.assertEqual(filename, actual)
-
-    def test_operations_puppet(self):
-        self.assertLogFile('operations.log',
-                           'operations/puppet',
-                           'production')
-        self.assertLogFile('labs.log',
-                           'operations/puppet',
-                           'test')
-        self.assertLogFile('labs.log',
-                           'operations/puppet',
-                           'IAmNotConfigured')
-
-    def test_labs_private_to_labs(self):
-        self.assertLogFile('labs.log',
-                           'labs/private')
-
-    def test_labs_to_wikimedia_labs(self):
-        self.assertLogFile('labs.log',
-                           'labs/someproject')
-
-    def test_operations_software_to_operations(self):
-        self.assertLogFile('operations.log',
-                           'operations/software')
-
-    def test_operations_dumps_to_operations(self):
-        self.assertLogFile('operations.log',
-                           'operations/dumps')
-
-    def test_operations_to_operations(self):
-        self.assertLogFile('operations.log',
-                           'operations/someProject')
-
-    # Some very specific WMF projects
-    def test_parsoid(self):
-        self.assertLogFile('parsoid.log',
-                           'mediawiki/extensions/Parsoid')
-
-    def test_mobile(self):
-        self.assertLogFile('mobile.log',
-                           'mediawiki/extensions/MobileFrontend')
-
-    def test_visualeditor(self):
-        self.assertLogFile('visualeditor.log',
-                           'mediawiki/extensions/VisualEditor')
-
-    # Semantic MediaWiki related
-    def test_semantic_mediawiki(self):
-        for repo in ['SemanticFoobar',
-                     'Validator',
-                     'Maps',
-                     'RDFIO',
-                     'SolrStore',
-                     'SMWFoobar']:
-            self.assertLogFile('semantic-mediawiki.log',
-                               'mediawiki/extensions/%s' % repo)
-
-    # Wikidata related
-    def test_wikidata_extensions(self):
-        for repo in ['Wikibase',
-                     'Diff',
-                     'DataValues']:
-            self.assertLogFile('wikidata.log',
-                               'mediawiki/extensions/%s' % repo)
-
-    def test_core_wikidata_branch(self):
-        # Wikidata branch is sent to a specific log
-        self.assertLogFile('wikidata.log',
-                           'mediawiki/core',
-                           'Wikidata')
-        # Make sure mediawiki/core.git@master is sent to #wikimedia-dev
-        self.assertLogFile('wikimedia-dev.log',
-                           'mediawiki/core',
-                           'master')
-
-    def test_mediawiki_tools_to_wikimediadev(self):
-        self.assertLogFile('wikimedia-dev.log',
-                           'mediawiki/tools/codesniffer')
-        self.assertLogFile('wikimedia-dev.log',
-                           'mediawiki/tools/upload/PhotoUpload')
-
-    def test_catchall_to_wikimediadev(self):
-        self.assertLogFile('wikimedia-dev.log',
-                           'department/project')
-
-    def test_qa_to_wikimediadev(self):
-        self.assertLogFile('wikimedia-dev.log',
-                           'qa/browsertests')
-
-    def test_gerrit_ping_are_ignored(self):
-        self.assertLogFile('ignored.log',
-                           'test/gerrit-ping')
-
-    def test_twn_to_mediawiki_i18n(self):
-        self.assertLogFile('mediawiki-i18n.log',
-                           'translatewiki')
-        self.assertLogFile('mediawiki-i18n.log',
-                           'translatewiki/futureproject')
-
-    def test_pwb_to_pywikipediabot(self):
-        self.assertLogFile('pywikipediabot.log',
-                           'pywikibot')
-        self.assertLogFile('pywikipediabot.log',
-                           'pywikibot/core')
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/files/gerrit/hooks/patchset-created 
b/files/gerrit/hooks/patchset-created
deleted file mode 100755
index 8185da5..0000000
--- a/files/gerrit/hooks/patchset-created
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python
-import sys
-import re
-from hookhelper import HookHelper
-
-sys.path.append('/var/lib/gerrit2/review_site/etc')
-import hookconfig
-
-
-class PatchsetCreated(HookHelper):
-    def run(self):
-        self.parser.set_usage("patchset-created --change")
-        self.parser.add_option("--uploader", dest="uploader")
-        self.parser.add_option("--commit", dest="commit")
-        self.parser.add_option("--patchset", dest="patchset", type="int")
-        self.parser.add_option("--is-draft", dest="draft")
-        self.parser.add_option("--topic", dest="topic")
-        (options, args) = self.parser.parse_args()
-        if not options.change or not options.change.isalnum():
-            self.parser.error("No change id, or changeid invalid")
-        if hookconfig.debug:
-            sys.stderr.write("Patchset passed in: " + str(options.patchset) + 
"\n")
-        if options.draft == "true":
-            return  # Don't report drafts to IRC!
-        subject = self.get_subject(options.change)
-        user = re.sub(' \(.*', "", options.uploader)
-        message = "New patchset: " + user + '; "' + subject + '" [' + 
options.project + "] (" + options.branch + ") - " + options.changeurl + "\n"
-        self.log_to_file(options.project, options.branch, message, user)
-
-if __name__ == '__main__':
-    hook = PatchsetCreated()
-    hook.run()
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index ddbb8c6..be443cf 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -160,11 +160,7 @@
                        mode => 0444,
                        require => File["/var/lib/gerrit2/review_site/etc"];
                "/var/lib/gerrit2/review_site/etc/hookconfig.py":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0444,
-                       content => template('gerrit/hookconfig.py.erb'),
-                       require => File["/var/lib/gerrit2/review_site/etc"];
+                       ensure => absent;
                "/var/lib/gerrit2/review_site/etc/mail/ChangeSubject.vm":
                        owner => gerrit2,
                        group => gerrit2,
@@ -222,47 +218,19 @@
                        ensure => directory,
                        require => Exec["install_gerrit_jetty"];
                "/var/lib/gerrit2/review_site/hooks/change-abandoned":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0555,
-                       source => 
"puppet:///files/gerrit/hooks/change-abandoned",
-                       require => File["/var/lib/gerrit2/review_site/hooks"];
+                       ensure => absent;
                "/var/lib/gerrit2/review_site/hooks/hookhelper.py":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0555,
-                       source => "puppet:///files/gerrit/hooks/hookhelper.py",
-                       require => File["/var/lib/gerrit2/review_site/hooks"];
+                       ensure => absent;
                "/var/lib/gerrit2/review_site/hooks/change-merged":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0555,
-                       source => "puppet:///files/gerrit/hooks/change-merged",
-                       require => File["/var/lib/gerrit2/review_site/hooks"];
+                       ensure => absent;
                "/var/lib/gerrit2/review_site/hooks/change-restored":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0555,
-                       source => 
"puppet:///files/gerrit/hooks/change-restored",
-                       require => File["/var/lib/gerrit2/review_site/hooks"];
+                       ensure => absent;
                "/var/lib/gerrit2/review_site/hooks/comment-added":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0555,
-                       source => "puppet:///files/gerrit/hooks/comment-added",
-                       require => File["/var/lib/gerrit2/review_site/hooks"];
+                       ensure => absent;
                "/var/lib/gerrit2/review_site/hooks/patchset-created":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0555,
-                       source => 
"puppet:///files/gerrit/hooks/patchset-created",
-                       require => File["/var/lib/gerrit2/review_site/hooks"];
+                       ensure => absent;
                "/var/lib/gerrit2/review_site/hooks/draft-published":
-                       owner => gerrit2,
-                       group => gerrit2,
-                       mode => 0555,
-                       source => 
"puppet:///files/gerrit/hooks/draft-published",
-                       require => File["/var/lib/gerrit2/review_site/hooks"];
+                       ensure => absent;
        }
 
        git::clone {
@@ -358,43 +326,18 @@
 }
 
 class gerrit::ircbot {
-
-       #target channels can be either strings or arrays.
-       #channels names will get a # prepended if it doesn't already start with 
one
-       $ircecho_logbase = "/var/lib/gerrit2/review_site/logs"
-       $ircecho_logs = {
-               "${ircecho_logbase}/operations.log"              => 
"#wikimedia-operations",
-               "${ircecho_logbase}/labs.log"                    => 
"#wikimedia-labs",
-               "${ircecho_logbase}/mobile.log"                  => 
"#wikimedia-mobile",
-               "${ircecho_logbase}/parsoid.log"                 => 
"#mediawiki-parsoid",
-               "${ircecho_logbase}/visualeditor.log"            => 
"#mediawiki-visualeditor",
-               "${ircecho_logbase}/mediawiki-i18n.log"          => 
"#mediawiki-i18n",
-               "${ircecho_logbase}/wikimedia-dev.log"           => 
"#wikimedia-dev",
-               "${ircecho_logbase}/semantic-mediawiki.log"      => 
["#semantic-mediawiki", "#wikimedia-dev"],
-               "${ircecho_logbase}/wikidata.log"                => 
"#wikimedia-wikidata",
-               "${ircecho_logbase}/wikimedia-analytics.log"     => 
"#wikimedia-analytics",
-               "${ircecho_logbase}/pywikipediabot.log"          => 
"#pywikipediabot",
-       }
-       $ircecho_nick = "gerrit-wm"
-       $ircecho_server = "chat.freenode.net"
-
        package { ['ircecho']:
-               ensure => latest;
+               ensure => absent;
        }
 
        service { ['ircecho']:
-               enable => true,
-               ensure => running;
+               enable => false,
+               ensure => stopped;
        }
 
        file {
                "/etc/default/ircecho":
-                       mode => 0444,
-                       owner => root,
-                       group => root,
-                       content => template('ircecho/default.erb'),
-                       notify => Service[ircecho],
-                       require => Package[ircecho];
+                       ensure => absent;
        }
 }
 
diff --git a/templates/gerrit/hookconfig.py.erb 
b/templates/gerrit/hookconfig.py.erb
deleted file mode 100644
index e94ae73..0000000
--- a/templates/gerrit/hookconfig.py.erb
+++ /dev/null
@@ -1,79 +0,0 @@
-# This file is managed by puppet
-# puppet:///templates/gerrit/hookconfig.py.erb
-#
-
-gerrituser = "gerrit2"
-sshhost = "<%= hostname %>"
-sshport = <%= sshport %>
-sshhostkeys = "/var/lib/gerrit2/.ssh/known_hosts"
-sshkey = "/var/lib/gerrit2/.ssh/id_rsa"
-debug = False
-logdir = "/var/lib/gerrit2/review_site/logs"
-
-# Files where Gerrit projects will have their notifications written to
-# See manifests/gerrit.pp $ircecho_logs for actual file/channel map
-filenames = {
-       "operations/puppet": {
-               "production" : "operations.log",
-               "test"       : "labs.log",
-               "default"    : "labs.log"
-       },
-
-       "mediawiki/core": {
-               "Wikidata" : "wikidata.log",
-               # Explicitly define a default, hookhelper does not fallback 
properly
-               "default"  : "wikimedia-dev.log",
-       },
-
-       # WMF projects
-       "mediawiki/extensions/MobileFrontend" : "mobile.log",
-       "mediawiki/extensions/ZeroRatedMobileAccess" : "mobile.log",
-       "mediawiki/extensions/Parsoid": "parsoid.log",
-       "mediawiki/extensions/VisualEditor": "visualeditor.log",
-       "mediawiki/extensions/TemplateData": "visualeditor.log",
-       "analytics/*"   : "wikimedia-analytics.log",
-       "integration/*" : "wikimedia-dev.log",
-       "labs/*"      : "labs.log",
-       "mediawiki/*" : "wikimedia-dev.log",
-       "mediawiki/tools/*" : "wikimedia-dev.log",
-       "operations/*": "operations.log",
-       "qa/*": "wikimedia-dev.log",
-
-       # SMW
-       "mediawiki/extensions/Semantic*" : "semantic-mediawiki.log",
-       "mediawiki/extensions/Validator" : "semantic-mediawiki.log",
-       "mediawiki/extensions/Maps" : "semantic-mediawiki.log",
-       "mediawiki/extensions/RDFIO" : "semantic-mediawiki.log",
-       "mediawiki/extensions/SolrStore" : "semantic-mediawiki.log",
-       "mediawiki/extensions/SMW*" : "semantic-mediawiki.log",
-
-       # Wikidata
-       "mediawiki/extensions/Wikibase" : "wikidata.log",
-       "mediawiki/extensions/Wikibase*" : "wikidata.log",
-       "mediawiki/extensions/Diff" : "wikidata.log",
-       "mediawiki/extensions/Ask" : "wikidata.log",
-       "mediawiki/extensions/DataTypes" : "wikidata.log",
-       "mediawiki/extensions/DataValues" : "wikidata.log",
-       "mediawiki/extensions/ValueView" : "wikidata.log",
-       "mediawiki/extensions/ValueValidators" : "wikidata.log",
-       "mediawiki/extensions/ValueParsers" : "wikidata.log",
-       "mediawiki/extensions/ValueFormatters" : "wikidata.log",
-
-       # We ping Gerrit everything 5 mins on test/gerrit-ping.git
-       # so just send that to a file which is not being used
-       # See also bug 46917
-       "test/gerrit-ping" : "ignored.log",
-
-       "translatewiki": "mediawiki-i18n.log",
-       "translatewiki/*": "mediawiki-i18n.log",
-
-       "pywikibot": "pywikipediabot.log",
-       "pywikibot/*": "pywikipediabot.log",
-
-       "default": "wikimedia-dev.log"
-}
-
-# These users are annoying since they're bots and such. Don't report their 
comments...
-spammyusers = ["jenkins-bot"]
-# ...or any of their actions
-reallyspammyusers = ["L10n-bot"]

-- 
To view, visit https://gerrit.wikimedia.org/r/74656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0a90e1bb824f71944f8ab2f2410aed10360cf56
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to