Tim Starling has submitted this change and it was merged.

Change subject: logmsgbot: only allow connections from tin, fenari & localhost
......................................................................


logmsgbot: only allow connections from tin, fenari & localhost

It'd be nicer to be a bit more permissive here and allow our full internal IP
ranges. Using single-address IPv6 CIDR ranges to specify single IPv4 IPs is a
bit ugly. But this is OK for now, I think.

Tested.

Change-Id: Ib33d3cc666f9c1ca0848ae067f3047d8b7939d3e
---
M manifests/site.pp
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index a77ab08..44bcf8c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1990,9 +1990,13 @@
                passwords::logmsgbot
 
        tcpircbot::instance { 'logmsgbot':
-               channel => '#wikimedia-operations',
+               channel  => '#wikimedia-operations',
                password => $passwords::logmsgbot::logmsgbot_password,
-               cidr => '::/0'
+               cidr     => [
+                       '::ffff:10.64.0.196/128',     # tin
+                       '::ffff:208.80.152.165/128',  # fenari
+                       '::ffff:127.0.0.1/128',       # loopback
+               ],
        }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib33d3cc666f9c1ca0848ae067f3047d8b7939d3e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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

Reply via email to