Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53973
Change subject: Finish puppetizing wikibugs bot
......................................................................
Finish puppetizing wikibugs bot
When deploying to mchenry, you'll need to update the filter from:
wikibugs-irc: |/usr/local/bin/wikibugs.pl
to
wikibugs-irc: |/var/lib/wikibugs/bin/wikibugs
Change-Id: I1bb72bee199d3bf24750460c298f96392d8a1818
---
A files/bugzilla/start-wikibugs-bot
M manifests/gerrit.pp
M manifests/misc/wikibugs.pp
M manifests/site.pp
4 files changed, 21 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/53973/1
diff --git a/files/bugzilla/start-wikibugs-bot
b/files/bugzilla/start-wikibugs-bot
new file mode 100644
index 0000000..a13afac
--- /dev/null
+++ b/files/bugzilla/start-wikibugs-bot
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd /
+
+su wikibugs -c '
+ tail -n0 -f /var/wikibugs/wikibugs.log | \
+ /usr/local/bin/ircecho "#mediawiki" wikibugs irc.freenode.net \
+ 2>&1 >/dev/null
+' &
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 94a3c57..e2f0a73 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -335,7 +335,7 @@
$ircecho_infile =
"/var/lib/gerrit2/review_site/logs/operations.log:#wikimedia-operations;/var/lib/gerrit2/review_site/logs/labs.log:#wikimedia-labs;/var/lib/gerrit2/review_site/logs/mobile.log:#wikimedia-mobile;/var/lib/gerrit2/review_site/logs/parsoid.log:#mediawiki-parsoid;/var/lib/gerrit2/review_site/logs/visualeditor.log:#mediawiki-visualeditor;/var/lib/gerrit2/review_site/logs/mediawiki.log:#mediawiki;/var/lib/gerrit2/review_site/logs/wikimedia-dev.log:#wikimedia-dev;/var/lib/gerrit2/review_site/logs/semantic-mediawiki.log:#semantic-mediawiki,#mediawiki;/var/lib/gerrit2/review_site/logs/wikidata.log:#wikimedia-wikidata"
$ircecho_nick = "gerrit-wm"
- $ircecho_chans =
"#wikimedia-operations,#wikimedia-labs,#wikimedia-mobile,#mediawiki-parsoid,#mediawiki-visualeditor,#mediawiki,#wikimedia-dev,#wikimedia-wikidata,#semantic-mediawiki"
+ $ircecho_chans =
"#wikimedia-operations,#wikimedia-labs,#wikimedia-mobile,#mediawiki-parsoid,#mediawiki-visualeditor,#mediawiki-feed,#wikimedia-dev,#wikimedia-wikidata,#semantic-mediawiki"
$ircecho_server = "irc.freenode.net"
package { ['ircecho']:
diff --git a/manifests/misc/wikibugs.pp b/manifests/misc/wikibugs.pp
index 5c4b58c..bf435c3 100644
--- a/manifests/misc/wikibugs.pp
+++ b/manifests/misc/wikibugs.pp
@@ -19,7 +19,7 @@
# Some Bugzilla product have been blessed with their own log files out
of the
# default one. Values are hardcoded in the Wikibugs perl script
- $ircecho_infile =
'/var/lib/wikibugs/logs/wikimedia-labs.log:#wikimedia-labs;/var/lib/wikibugs/logs/wikimedia-mobile.log:#wikimedia-mobile;/var/lib/wikibugs/logs/mediawiki.log:#mediawiki-feed'
+ $ircecho_infile =
'/var/lib/wikibugs/log/wikimedia-labs.log:#wikimedia-labs;/var/lib/wikibugs/log/wikimedia-mobile.log:#wikimedia-mobile;/var/lib/wikibugs/log/mediawiki.log:#mediawiki-feed'
$ircecho_nick = "wikibugs"
# Add channels defined in $ircecho_infile:
$ircecho_chans = '#wikimedia-labs,#wikimedia-mobile,#mediawiki-feed'
@@ -32,17 +32,23 @@
file {
"/var/lib/wikibugs/log":
+ ensure => directory,
owner => wikibugs,
group => wikidev,
mode => 0775,
require => User['wikibugs'];
+ "/usr/local/bin/start-wikibugs-bot":
+ owner => wikibugs,
+ group => wikidev,
+ mode => 0755,
+ require => User['wikibugs'];
}
git::clone { "wikibugs" :
- directory => "/var/lib/wikibugs/script",
+ directory => "/var/lib/wikibugs/bin",
origin =>
"https://gerrit.wikimedia.org/r/p/wikimedia/bugzilla/wikibugs.git";,
owner => wikibugs,
group => wikidev,
- require => File['/var/lib/wikibugs'];
+ require => User['wikibugs'];
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4dc3fc5..bcf3c34 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1458,7 +1458,8 @@
role::ldap::client::corp,
backup::client,
groups::wikidev,
- accounts::jdavis
+ accounts::jdavis,
+ misc::irc::wikibugs
include network::constants
--
To view, visit https://gerrit.wikimedia.org/r/53973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bb72bee199d3bf24750460c298f96392d8a1818
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
