Tim Starling has submitted this change and it was merged.
Change subject: Move logmsgbot from fenari to neon
......................................................................
Move logmsgbot from fenari to neon
In preparation for move of scap to tin, which has no external network
access.
Change-Id: Ieeca580fa38e2d75496fa9df6cd2f6e49e808a45
---
M files/misc/scripts/dologmsg
M manifests/site.pp
2 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/files/misc/scripts/dologmsg b/files/misc/scripts/dologmsg
index d2ab48a..0874d81 100755
--- a/files/misc/scripts/dologmsg
+++ b/files/misc/scripts/dologmsg
@@ -1,5 +1,5 @@
#! /bin/sh
if [ -z $DOLOGMSGNOLOG ]; then
- echo "$*" >> /var/log/logmsg
+ echo "$*" | nc -q0 neon.wikimedia.org 9200
fi
diff --git a/manifests/site.pp b/manifests/site.pp
index 19b2ab2..70cdf8d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -827,10 +827,6 @@
$cluster = "misc"
$domain_search = "wikimedia.org pmtpa.wmnet eqiad.wmnet
esams.wikimedia.org"
- $ircecho_logs = { "/var/log/logmsg" => "#wikimedia-operations" }
- $ircecho_nick = "logmsgbot"
- $ircecho_server = "chat.freenode.net"
-
include role::applicationserver::maintenance,
svn::client,
nfs::netapp::home,
@@ -841,7 +837,6 @@
misc::deployment,
misc::noc-wikimedia,
misc::deployment::scap_scripts,
- misc::ircecho,
misc::deployment::l10nupdate,
dns::account,
nrpe,
@@ -1987,7 +1982,14 @@
$ircecho_server = "chat.freenode.net"
include standard,
icinga::monitor,
- misc::ircecho
+ misc::ircecho,
+ tcpircbot,
+ passwords::logmsgbot
+
+ tcpircbot::instance { 'logmsgbot':
+ channel => '#wikimedia-operations',
+ password => $passwords::logmsgbot::logmsgbot_password
+ }
}
node "nescio.esams.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/61746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieeca580fa38e2d75496fa9df6cd2f6e49e808a45
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Starling <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
