[MediaWiki-commits] [Gerrit] (WIP) this should work... - change (operations/puppet)

2015-07-08 Thread Elee (Code Review) 
Elee has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223581

Change subject: (WIP) this should work...
..

(WIP) this should work...

Change-Id: I9515036f504d9512da2cb8c2cc5ee74dde5af8de
---
M modules/icinga/manifests/nsca/firewall.pp
1 file changed, 24 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/223581/1

diff --git a/modules/icinga/manifests/nsca/firewall.pp 
b/modules/icinga/manifests/nsca/firewall.pp
index cd792f2..b8de912 100644
--- a/modules/icinga/manifests/nsca/firewall.pp
+++ b/modules/icinga/manifests/nsca/firewall.pp
@@ -4,6 +4,29 @@
 class icinga::nsca::firewall {
 # NSCA on port 5667
 ferm::rule { 'ncsa_allowed':
-rule = 'saddr (127.0.0.1 $EQIAD_PRIVATE_ANALYTICS1_A_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_B_EQIAD $EQIAD_PRIVATE_ANALYTICS1_C_EQIAD 
$EQIAD_PRIVATE_ANALYTICS1_D_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_A_EQIAD 
$EQIAD_PRIVATE_LABS_HOSTS1_B_EQIAD $EQIAD_PRIVATE_LABS_HOSTS1_D_EQIAD 
$EQIAD_PRIVATE_LABS_SUPPORT1_C_EQIAD $EQIAD_PRIVATE_PRIVATE1_A_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_B_EQIAD $EQIAD_PRIVATE_PRIVATE1_C_EQIAD 
$EQIAD_PRIVATE_PRIVATE1_D_EQIAD $EQIAD_PUBLIC_PUBLIC1_A_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_B_EQIAD $EQIAD_PUBLIC_PUBLIC1_C_EQIAD 
$EQIAD_PUBLIC_PUBLIC1_D_EQIAD $ESAMS_PRIVATE_PRIVATE1_ESAMS 
$ESAMS_PUBLIC_PUBLIC1_ESAMS $ULSFO_PRIVATE_PRIVATE1_ULSFO 
$ULSFO_PUBLIC_PUBLIC1_ULSFO 208.80.155.0/27 10.64.40.0/24) proto tcp dport 5667 
ACCEPT;'
+rule = 'saddr (127.0.0.1 \
+  $EQIAD_PRIVATE_ANALYTICS1_A_EQIAD \
+  $EQIAD_PRIVATE_ANALYTICS1_B_EQIAD \
+  $EQIAD_PRIVATE_ANALYTICS1_C_EQIAD \
+  $EQIAD_PRIVATE_ANALYTICS1_D_EQIAD \
+  $EQIAD_PRIVATE_LABS_HOSTS1_A_EQIAD \
+  $EQIAD_PRIVATE_LABS_HOSTS1_B_EQIAD \
+  $EQIAD_PRIVATE_LABS_HOSTS1_D_EQIAD \
+  $EQIAD_PRIVATE_LABS_SUPPORT1_C_EQIAD \
+  $EQIAD_PRIVATE_PRIVATE1_A_EQIAD \
+  $EQIAD_PRIVATE_PRIVATE1_B_EQIAD \
+  $EQIAD_PRIVATE_PRIVATE1_C_EQIAD \
+  $EQIAD_PRIVATE_PRIVATE1_D_EQIAD \
+  $EQIAD_PUBLIC_PUBLIC1_A_EQIAD \
+  $EQIAD_PUBLIC_PUBLIC1_B_EQIAD \
+  $EQIAD_PUBLIC_PUBLIC1_C_EQIAD \
+  $EQIAD_PUBLIC_PUBLIC1_D_EQIAD \
+  $ESAMS_PRIVATE_PRIVATE1_ESAMS \
+  $ESAMS_PUBLIC_PUBLIC1_ESAMS \
+  $ULSFO_PRIVATE_PRIVATE1_ULSFO \
+  $ULSFO_PUBLIC_PUBLIC1_ULSFO \
+  208.80.155.0/27 \
+  10.64.40.0/24) \
+proto tcp dport 5667 ACCEPT;'
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9515036f504d9512da2cb8c2cc5ee74dde5af8de
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elee e...@mit.edu

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] added year into logging - change (operations...adminbot)

2015-07-06 Thread Elee (Code Review) 
Elee has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223046

Change subject: added year into logging
..

added year into logging

Change-Id: Ia1a8bddfa60fc50d95cfbc2227ca395b8b68f7c4
---
M adminlog.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot 
refs/changes/46/223046/1

diff --git a/adminlog.py b/adminlog.py
index 240c778..2e89a4e 100644
--- a/adminlog.py
+++ b/adminlog.py
@@ -43,7 +43,7 @@
if months[now.month - 1] != month or now.day != int(day):
lines.insert(0, )
lines.insert(0, logline)
-   lines.insert(0, %s %s %d %s % (header, months[now.month - 1],
+   lines.insert(0, %s %s %d %s % (header, now.year, 
months[now.month - 1],
now.day, header))
else:
lines.insert(position, logline)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1a8bddfa60fc50d95cfbc2227ca395b8b68f7c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/adminbot
Gerrit-Branch: master
Gerrit-Owner: Elee e...@mit.edu

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] xtools moved to wikimedia-xtools Change-Id: Ie84324e718d8025... - change (labs...wikibugs2)

2015-07-02 Thread Elee (Code Review) 
Elee has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222360

Change subject: xtools moved to wikimedia-xtools Change-Id: 
Ie84324e718d8025f4a1381f36d9ff5f4e9c5848d
..

xtools moved to wikimedia-xtools
Change-Id: Ie84324e718d8025f4a1381f36d9ff5f4e9c5848d
---
M channels.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/60/222360/1

diff --git a/channels.yaml b/channels.yaml
index 1c95990..08c6770 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -173,7 +173,7 @@
 - UI-Standardization
 - mediawiki-skins-Blueprint
 
-#xtools:
+#wikimedia-xtools:
 - Tool-Labs-xTools
 
 firehose-channel: '#mediawiki-feed'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie84324e718d8025f4a1381f36d9ff5f4e9c5848d
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Elee e...@mit.edu

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits