Andrew Bogott has submitted this change and it was merged.
Change subject: Remove morebots classes.
......................................................................
Remove morebots classes.
These bots live in the 'tools' labs project now,
where they're managed with the grid engine.
Change-Id: I3daa11feef91308218cca14082e2976d57a92cec
---
D manifests/bots.pp
D manifests/role/logbot.pp
2 files changed, 0 insertions(+), 106 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/bots.pp b/manifests/bots.pp
deleted file mode 100644
index c20219b..0000000
--- a/manifests/bots.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-# Installs a logbot. Channel, name, etc. are configurable.
-# at the moment, only one bot per instance, and only one
-# log page per bot will work.
-class bots::logbot( $ensure = 'present',
- $enable_projects = "False",
- $targets = '()',
- $nick = '("anonbot")',
- $nickserv = 'nickserv',
- # For security reasons, nick_password, wiki_user
and wiki_pass
- # are not puppetized. Instead, insert them into
this
- # file and it will be included in the config,
python-style.
- $password_include_file = '',
- $network = 'chat.freenode.net',
- $port = 6667,
- $author_map = '{}',
- $title_map = '{}',
- $wiki_connection =
'("https","wikitech.wikimedia.org")',
- $wiki_path = "/w/",
- $wiki_user = "anon",
- # The page for viewing logs doesn't necessarily
- # follow from wiki_path, so roles need to set it
explicitly
- # here. This setting is only used in the bot's
help message.
- $log_url = "(unknown)",
- $wiki_domain = "",
- $wiki_page = "",
- $wiki_header_depth = 3,
- $wiki_category = "SAL") {
-
- package { adminbot:
- ensure => $ensure;
- }
-
- file {
- "/etc/adminbot/config.py":
- mode => 644,
- owner => root,
- group => root,
- content => template('adminbot/config.py.erb'),
- ensure => present,
- notify => Service[adminbot];
- "/var/run/adminbot":
- mode => 644,
- owner => adminbot,
- group => root,
- ensure => directory;
- "/var/log/adminbot.log":
- mode => 644,
- owner => adminbot,
- group => root,
- ensure => present
- }
-
- service { 'adminbot':
- name => "adminbot",
- ensure => running;
- }
-}
diff --git a/manifests/role/logbot.pp b/manifests/role/logbot.pp
deleted file mode 100644
index d18caf7..0000000
--- a/manifests/role/logbot.pp
+++ /dev/null
@@ -1,49 +0,0 @@
-import "../bots.pp"
-
-
-# Install the logbot for wikimedia-labs. It logs to a page on wikitech.
-class role::logbot::wikimedia-labs {
-
- include passwords::misc::scripts
-
- class { "bots::logbot":
- enable_projects => "True",
- ensure => latest,
- targets => ["#wikimedia-labs"],
- nick => "labs-morebots",
- wiki_connection => '("https","wikitech.wikimedia.org")',
- wiki_path => "/w/",
- password_include_file => 'adminbotpass',
- author_map => '{ "TimStarling": "Tim", "_mary_kate_": "river",
"yksinaisyyteni": "river", "flyingparchment": "river", "RobH": "RobH",
"werdnum": "Andrew", "werdna": "Andrew", "werdnus": "Andrew", "aZaFred":
"Fred", "^demon": "Chad" }',
- title_map => '{ "Andrew": "junior", "RoanKattouw": "Mr.
Obvious", "RobH": "RobH", "notpeter": "and now dispaching a T1000 to your
position to terminate you.", "domas": "o lord of the trolls, my master, my
love. I can\'t live with out you; oh please log to me some more!", "^demon" :
"you sysadmin wannabe.", "andrewbogott": "dummy" }',
- log_url => "wikitech.wikimedia.org/wiki/Server_Admin_Log",
- wiki_domain => "labs",
- wiki_page => "Nova_Resource:%s/SAL",
- wiki_header_depth => 3,
- wiki_category => "SAL";
- }
-}
-
-
-# Install the logbot for wikimedia-analytics.
-class role::logbot::wikimedia-analytics {
-
- include passwords::misc::scripts
-
- class { "bots::logbot":
- ensure => latest,
- enable_projects => "False",
- targets => ["#wikimedia-analytics"],
- nick => "analytics-logbot",
- wiki_connection => '("https","www.mediawiki.org")',
- wiki_path => "/w/",
- log_url => "www.mediawiki.org/wiki/Analytics/Server_Admin_Log",
- password_include_file => 'adminbotpass',
- author_map => '{ "TimStarling": "Tim", "_mary_kate_": "river",
"yksinaisyyteni": "river", "flyingparchment": "river", "RobH": "RobH",
"werdnum": "Andrew", "werdna": "Andrew", "werdnus": "Andrew", "aZaFred":
"Fred", "^demon": "Chad" }',
- title_map => '{ "Andrew": "junior", "RoanKattouw": "Mr.
Obvious", "RobH": "RobH", "notpeter": "and now dispaching a T1000 to your
position to terminate you.", "domas": "o lord of the trolls, my master, my
love. I can\'t live with out you; oh please log to me some more!", "^demon" :
"you sysadmin wannabe.", "andrewbogott": "dummy", "drdee": "cap\'n" }',
- wiki_domain => "analytics",
- wiki_page => "Analytics/Server_Admin_Log",
- wiki_header_depth => 3,
- wiki_category => "";
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/58922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3daa11feef91308218cca14082e2976d57a92cec
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
