[MediaWiki-commits] [Gerrit] misc: add rutherfordium and point people.wm.o to it - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: misc: add rutherfordium and point people.wm.o to it
..

misc: add rutherfordium and point people.wm.o to it

Adds rutherfordium.eqiad.wmnet as a new backend and point people.wm.o to it.
Also change the comment on terbium from public_html to noc.wm.o.

Bug: T116992
Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc.inc.vcl.erb
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/251115/1

diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index 51adc04..a35f410 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -120,12 +120,17 @@
 'type' => 'random',
 'backends' => ['ruthenium.eqiad.wmnet'],
 },
+'rutherfordium' => { # people.wikimedia.org
+'dynamic' => 'no',
+'type' => 'random',
+'backends' => ['rutherfordium.eqiad.wmnet'],
+},
 'stat1001' => { # metrics and metrics-api
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['stat1001.eqiad.wmnet'],
 },
-'terbium' => { # public_html
+'terbium' => { # noc.wikimedia.org
 'dynamic' => 'no',
 'type' => 'random',
 'backends' => ['terbium.eqiad.wmnet'],
diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index a363423..09f51ba 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -63,7 +63,7 @@
 // No caching of OTRS for now
 return (pass);
 } elsif (req.http.Host == "people.wikimedia.org") {
-set req.backend = terbium;
+set req.backend = rutherfordium;
 // No caching of public_html dirs
 return (pass);
 } elsif (req.http.Host == "racktables.wikimedia.org" || req.http.Host == 
"rt.wikimedia.org") {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bc23224612ce18f6609f84c22c3a5eeaf263a5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] send Mailing lists tickets to #wikimedia-mailman - change (labs...wikibugs2)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: send Mailing lists tickets to #wikimedia-mailman
..

send Mailing lists tickets to #wikimedia-mailman

Change-Id: Iefb003cc8dac14e718a2d710e1013a11a0a96827
---
M channels.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/channels.yaml b/channels.yaml
index 89eb65e..2245d38 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -72,6 +72,9 @@
 - Gitblit-Deprecate
 - Project-Creators
 
+"#wikimedia-mailman":
+- Wikimedia-Mailing-lists
+
 "#wikimedia-otrs":
 - OTRS
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefb003cc8dac14e718a2d710e1013a11a0a96827
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: reject subscriptions from disabled list - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: reject subscriptions from disabled list
..

mailman: reject subscriptions from disabled list

Change-Id: If7842c62bf05b722f1ac862d83860dc1145d1710
---
M modules/mailman/files/scripts/disable_list.sh
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/249487/1

diff --git a/modules/mailman/files/scripts/disable_list.sh 
b/modules/mailman/files/scripts/disable_list.sh
index 61c086e..f17d0fe 100644
--- a/modules/mailman/files/scripts/disable_list.sh
+++ b/modules/mailman/files/scripts/disable_list.sh
@@ -11,6 +11,7 @@
 echo "emergency=1"  | config_list -i /dev/stdin $list
 echo "member_moderation_action=2" | config_list -i /dev/stdin $list
 echo "generic_nonmember_action=2" | config_list -i /dev/stdin $list
+echo "ban_list=['^.*@.*]" | config_list -i /dev/stdin $list
 if find /var/lib/mailman/data/ | grep heldmsg-$list; then
 rm /var/lib/mailman/data/heldmsg-$list-*.pck
 fi
@@ -21,6 +22,7 @@
 echo "emergency=0"  | config_list -i /dev/stdin $list
 echo "member_moderation_action=0" | config_list -i /dev/stdin $list
 echo "generic_nonmember_action=1" | config_list -i /dev/stdin $list
+echo "ban_list=[]" | config_list -i /dev/stdin $list
 }
 
 function usage {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7842c62bf05b722f1ac862d83860dc1145d1710
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] partman: remove unused mailserver recipe - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: partman: remove unused mailserver recipe
..

partman: remove unused mailserver recipe

In the sodium move, this was not applied to fermium and was only a
comment when sodium was still around. Unused, serves no purpose.

Change-Id: Iea9d101ab3c419847a052e2fef154faec2451ec8
---
D modules/install_server/files/autoinstall/partman/mailserver.cfg
1 file changed, 0 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/249677/1

diff --git a/modules/install_server/files/autoinstall/partman/mailserver.cfg 
b/modules/install_server/files/autoinstall/partman/mailserver.cfg
deleted file mode 100644
index 29bab11..000
--- a/modules/install_server/files/autoinstall/partman/mailserver.cfg
+++ /dev/null
@@ -1,57 +0,0 @@
-# Automatic software RAID 1 with LVM partitioning
-
-d-i partman-auto/method string  raid
-
-# Use the first two disks
-d-i partman-auto/disk   string  /dev/sda /dev/sdb
-
-# Define physical partitions
-d-i partman-auto/expert_recipe  string  \
-multiraid ::   
\
-5000800016000   raid   
\
-$primary{ } $lvmignore{ } method{ raid }   
\
-.  
\
-   64  10001000raid
\
-   $primary{ } $lvmignore { } method{ raid }   
\
-   .   
\
-   400040004000linux-swap  
\
-   $defaultignore{ } $lvmok{ } 
\
-   lv_name{ swap } method{ swap } format{ }
\
-   .   
\
-   100 100030  xfs 
\
-   $defaultignore{ } $lvmok{ } 
\
-   lv_name{ mailman } method{ format } format{ }   
\
-   use_filesystem{ } filesystem{ xfs } 
\
-   mountpoint{ /var/lib/mailman }  
\
-   .   
\
-   100 10006   xfs 
\
-   $defaultignore{ } $lvmok{ } 
\
-   lv_name{ exim } method{ format } format{ }  
\
-   use_filesystem{ } filesystem{ xfs } 
\
-   mountpoint{ /var/spool/exim4 }  
\
-   .
-   
-
-# Parameters are:
-#  \
-#   
-d-ipartman-auto-raid/recipestring  \
-   1   2   0   ext3/   \
-   /dev/sda1#/dev/sdb1 \
-   .   \
-   1   2   0   lvm -   \
-   /dev/sda2#/dev/sdb2 \
-   .   
-#  1   2   0   lvm /var/lib/mailman\
-#  /dev/sda5#/dev/sdb5 \
-#  .
-
-d-ipartman-md/confirm  boolean true
-d-ipartman-md/device_remove_md boolean true
-d-ipartman/confirm_write_new_label boolean true
-d-ipartman/choose_partitionselect  finish
-d-ipartman/confirm boolean true
-d-ipartman/confirm_nooverwrite boolean true
-
-d-ipartman-auto-lvm/guided_sizestring  80%
-d-ipartman-lvm/device_remove_lvm   boolean true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea9d101ab3c419847a052e2fef154faec2451ec8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: fix syntax in disable_list ban_list echo - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: fix syntax in disable_list ban_list echo
..

mailman: fix syntax in disable_list ban_list echo

Change-Id: I71c465118cb0a1e99b1d64b04666e9f4f5556efb
---
M modules/mailman/files/scripts/disable_list.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/249584/1

diff --git a/modules/mailman/files/scripts/disable_list.sh 
b/modules/mailman/files/scripts/disable_list.sh
index f17d0fe..95a7e66 100644
--- a/modules/mailman/files/scripts/disable_list.sh
+++ b/modules/mailman/files/scripts/disable_list.sh
@@ -11,7 +11,7 @@
 echo "emergency=1"  | config_list -i /dev/stdin $list
 echo "member_moderation_action=2" | config_list -i /dev/stdin $list
 echo "generic_nonmember_action=2" | config_list -i /dev/stdin $list
-echo "ban_list=['^.*@.*]" | config_list -i /dev/stdin $list
+echo "ban_list=['^.*@.*']" | config_list -i /dev/stdin $list
 if find /var/lib/mailman/data/ | grep heldmsg-$list; then
 rm /var/lib/mailman/data/heldmsg-$list-*.pck
 fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71c465118cb0a1e99b1d64b04666e9f4f5556efb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: remove check for out queue [+data cron] - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: remove check for out queue [+data cron]
..

mailman: remove check for out queue [+data cron]

Provides nothing useful, regular increases make it impossible to accurately 
detect
an increase. in, bounces and virgin sufficiently handles the need anyway.

Remove the cron on fermium too from root crontab.

Change-Id: I5c25b2f00087ce07457452233ffc0cdb90a9851c
---
M files/icinga/check_mailman_queue
M modules/mailman/manifests/cron.pp
2 files changed, 6 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/249037/1

diff --git a/files/icinga/check_mailman_queue b/files/icinga/check_mailman_queue
index a404636..9279e5a 100755
--- a/files/icinga/check_mailman_queue
+++ b/files/icinga/check_mailman_queue
@@ -10,17 +10,16 @@
 # /files/icinga/check_mailman_queue 
 
 mailman_base="/var/lib/mailman/qfiles"
-FILES="$mailman_base/bounces $mailman_base/in $mailman_base/out 
$mailman_base/virgin"
+FILES="$mailman_base/bounces $mailman_base/in $mailman_base/virgin"
 
 queue_limit_bounces=$1
 queue_limit_in=$2
-queue_limit_out=$3
-queue_limit_virgin=$4
+queue_limit_virgin=$3
 
 critqueues=0
 debug=false
 
-if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ]; then echo "usage: 
./check_mailman_queue
"; exit 3; fi
+if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then echo "usage: 
./check_mailman_queue   "; exit 3; fi
 
 for f in $FILES
 do
@@ -29,9 +28,9 @@
 queue_size=$(ls $f|wc -l)
 if $debug; then echo "${f}: ${queue_size}"; fi
 
-if [ $queue_size -gt $queue_limit_bounces ] || [ $queue_size -gt 
$queue_limit_in ] || [ $queue_size -gt $queue_limit_out ] || [ $queue_size -gt 
$queue_limit_virgin ]
+if [ $queue_size -gt $queue_limit_bounces ] || [ $queue_size -gt 
$queue_limit_in ] || [ $queue_size -gt $queue_limit_virgin ]
 then
-if $debug; then echo "CRIT: ${f}: ${queue_size} (thresholds: 
bounces: ${queue_limit_bounces} in: ${queue_limit_in} out: ${queue_limit_out} 
virgin: ${queue_limit_virgin}"; fi
+if $debug; then echo "CRIT: ${f}: ${queue_size} (thresholds: 
bounces: ${queue_limit_bounces} in: ${queue_limit_in} virgin: 
${queue_limit_virgin}"; fi
 ((critqueues++))
 if $debug; then echo "crit queues: ${critqueues}"; fi
 fi
@@ -44,7 +43,7 @@
 
 if [ $critqueues -ge 1 ]
 then
-echo "CRITICAL: ${critqueues} mailman queue(s) above limits 
(thresholds: bounces: ${queue_limit_bounces} in: ${queue_limit_in} out: 
${queue_limit_out} virgin: ${queue_limit_virgin})"
+echo "CRITICAL: ${critqueues} mailman queue(s) above limits 
(thresholds: bounces: ${queue_limit_bounces} in: ${queue_limit_in} virgin: 
${queue_limit_virgin})"
 exit 2
 else
 echo "OK: mailman queues are below the limits."
diff --git a/modules/mailman/manifests/cron.pp 
b/modules/mailman/manifests/cron.pp
index 76ba87d..e0b1049 100644
--- a/modules/mailman/manifests/cron.pp
+++ b/modules/mailman/manifests/cron.pp
@@ -8,14 +8,5 @@
 hour=> '3',
 minute  => '0',
 }
-
-# temporary cron for statistics on queue data
-cron { 'queue_data':
-ensure  => 'present',
-command => '/usr/local/sbin/queue_data -a >> /var/www/qdata.html',
-user=> 'root',
-minute  => '15',
-}
-
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c25b2f00087ce07457452233ffc0cdb90a9851c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: run qdata cron later into 8am bounces - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: run qdata cron later into 8am bounces
..

mailman: run qdata cron later into 8am bounces

Data being gathered is below limits but alerts are being fired after the run.

Change-Id: Id6bd75c02e5c3d1c54dcfc6c40d918e93ab42096
---
M modules/mailman/manifests/cron.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/248044/1

diff --git a/modules/mailman/manifests/cron.pp 
b/modules/mailman/manifests/cron.pp
index 4ff494e..76ba87d 100644
--- a/modules/mailman/manifests/cron.pp
+++ b/modules/mailman/manifests/cron.pp
@@ -14,7 +14,7 @@
 ensure  => 'present',
 command => '/usr/local/sbin/queue_data -a >> /var/www/qdata.html',
 user=> 'root',
-minute  => '2',
+minute  => '15',
 }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6bd75c02e5c3d1c54dcfc6c40d918e93ab42096
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: increase out queue to 300 check - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: increase out queue to 300 check
..

mailman: increase out queue to 300 check

Bug: T114861
Change-Id: Ie01411c627d17f5947505b517dabdfacb43a9116
---
M manifests/role/lists.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/247604/1

diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 1943e31..cae94f3 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -116,7 +116,7 @@
 
 nrpe::monitor_service { 'mailman_queue':
 description   => 'mailman_queue_size',
-nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 25 25 200 25',
+nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 25 25 300 25',
 }
 
 # on list servers we monitor I/O with iostat

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie01411c627d17f5947505b517dabdfacb43a9116
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: add cron to gather queue data - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: add cron to gather queue data
..

mailman: add cron to gather queue data

Bug: T114861
Change-Id: I4618114137e7be35f811fff5954c81fca5b4fa7c
---
M modules/mailman/manifests/cron.pp
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/247472/1

diff --git a/modules/mailman/manifests/cron.pp 
b/modules/mailman/manifests/cron.pp
index af6605b..8a3e5b0 100644
--- a/modules/mailman/manifests/cron.pp
+++ b/modules/mailman/manifests/cron.pp
@@ -9,5 +9,13 @@
 minute  => '0',
 }
 
+# temporary cron for statistics on queue data
+cron { 'queue_data':
+ensure  => 'present',
+command => "/usr/local/sbin/queue_data -a >> /var/www/qdata.html",
+user=> 'root',
+minute  => '2',
+}
+
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4618114137e7be35f811fff5954c81fca5b4fa7c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] move all non-default contact_group variables to hiera - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: move all non-default contact_group variables to hiera
..

move all non-default contact_group variables to hiera

Change-Id: I01ca1b5c4e5964537d1f0d6722a218e2331ffe33
---
M hieradata/common/contint.yaml
M hieradata/role/common/aqs.yaml
M hieradata/role/common/cassandra.yaml
M hieradata/role/common/eventlogging.yaml
M hieradata/role/common/phabricator/main.yaml
M hieradata/role/common/restbase.yaml
M manifests/misc/udp2log.pp
M manifests/role/aqs.pp
M manifests/role/cassandra.pp
M manifests/role/eventlogging.pp
M manifests/role/nodepool.pp
M manifests/role/restbase.pp
M modules/eventlogging/manifests/monitoring/graphite.pp
M modules/eventlogging/manifests/monitoring/jobs.pp
M modules/icinga/manifests/monitor/checkpaging.pp
M modules/icinga/manifests/monitor/legal.pp
M modules/icinga/manifests/monitor/ripeatlas.pp
M modules/jenkins/manifests/init.pp
M modules/phabricator/manifests/monitoring.pp
M modules/restbase/manifests/monitoring.pp
M modules/zuul/manifests/monitoring/merger.pp
M modules/zuul/manifests/monitoring/server.pp
22 files changed, 8 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/244814/1

diff --git a/hieradata/common/contint.yaml b/hieradata/common/contint.yaml
index b15701d..86102c0 100644
--- a/hieradata/common/contint.yaml
+++ b/hieradata/common/contint.yaml
@@ -12,3 +12,4 @@
 - 208.80.154.135  # gallium.wikimedia.org
 - '::1'  # Uses quotes for hiera
 - 127.0.0.1
+contactgroups: admins,contint
diff --git a/hieradata/role/common/aqs.yaml b/hieradata/role/common/aqs.yaml
index 1709b51..f8599e5 100644
--- a/hieradata/role/common/aqs.yaml
+++ b/hieradata/role/common/aqs.yaml
@@ -4,6 +4,7 @@
 admin::groups:
 - aqs-admins
 
+contactgroups: admins,analytics
 #
 # Cassandra for AQS
 #
diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 217bc07..1adddae 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -38,3 +38,4 @@
 
 cassandra::application_username: restbase
 cassandra::application_password: "%{passwords::cassandra::restbase}"
+contactgroups: admins,team-services
diff --git a/hieradata/role/common/eventlogging.yaml 
b/hieradata/role/common/eventlogging.yaml
index 86f9540..8d2b878 100644
--- a/hieradata/role/common/eventlogging.yaml
+++ b/hieradata/role/common/eventlogging.yaml
@@ -1,3 +1,4 @@
 admin::groups:
   - eventlogging-admins
   - eventlogging-roots
+contactgroups: admins,analytics
diff --git a/hieradata/role/common/phabricator/main.yaml 
b/hieradata/role/common/phabricator/main.yaml
index 16887b0..8b9f1e3 100644
--- a/hieradata/role/common/phabricator/main.yaml
+++ b/hieradata/role/common/phabricator/main.yaml
@@ -2,5 +2,6 @@
 admin::groups:
   - phabricator-admin
   - phabricator-roots
+contactgroups: admins,phabricator
 apache::logrotate::period: "daily"
 apache::logrotate::rotate: 3
diff --git a/hieradata/role/common/restbase.yaml 
b/hieradata/role/common/restbase.yaml
index 0ce6c75..5b65387 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -18,3 +18,4 @@
 
 admin::groups:
   - restbase-roots
+contactgroups: admins,team-services
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 0917e7e..f690ac3 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -244,7 +244,6 @@
 ensure=> 'present',
 description   => "udp2log log age for ${name}",
 nrpe_command  => "/usr/lib/nagios/plugins/check_udp2log_log_age 
${name}",
-contact_group => 'admins,analytics',
 }
 }
 # TODO else ensure absent,
@@ -257,7 +256,6 @@
 ensure=> 'present',
 description   => "udp2log processes for ${name}",
 nrpe_command  => "/usr/lib/nagios/plugins/check_udp2log_procs 
${name}",
-contact_group => 'admins,analytics',
 retries   => 10,
 }
 }
@@ -301,7 +299,6 @@
 metric=> 'packet_loss_average',
 warning   => '4',
 critical  => '8',
-contact_group => 'admins,analytics',
 # ganglia-logtailer only runs every 5.
 # let's make nagios check every 2 minutes (to match ganglia_parser)
 # and retry 4 times (total 8 minutes) before
diff --git a/manifests/role/aqs.pp b/manifests/role/aqs.pp
index 861962c..c8ecdca 100644
--- a/manifests/role/aqs.pp
+++ b/manifests/role/aqs.pp
@@ -33,7 +33,6 @@
 monitoring::service { 'cassandra-analytics-cql':
 description   => 'Analytics Cassanda CQL query interface',
 check_command => 'check_tcp!9042',
-contact_group => 'admins,analytics',
 }
 
 

[MediaWiki-commits] [Gerrit] monitoring: append sms to contact groups, don't override wit... - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: monitoring: append sms to contact groups, don't override with 
admins,sms
..

monitoring: append sms to contact groups, don't override with admins,sms

Change-Id: I9652ada7eaee2e6604cc6ba07dd5676fb593f286
---
M modules/monitoring/manifests/host.pp
M modules/monitoring/manifests/service.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/244806/1

diff --git a/modules/monitoring/manifests/host.pp 
b/modules/monitoring/manifests/host.pp
index 7f557ce..a4172b1 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -25,7 +25,7 @@
 }
 
 $is_critical = $critical ? {
-true=> 'admins,sms',
+true=> "${contact_group},sms",
 default => $contact_group,
 }
 
diff --git a/modules/monitoring/manifests/service.pp 
b/modules/monitoring/manifests/service.pp
index 3748286..b63a075 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -33,7 +33,7 @@
 }
 
 $contact_critical = $critical ? {
-true=> 'admins,sms',
+true=> "${contact_group},sms",
 default => $contact_group,
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9652ada7eaee2e6604cc6ba07dd5676fb593f286
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] fix hiera key for wdqs (contactgroups) - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: fix hiera key for wdqs (contactgroups)
..

fix hiera key for wdqs (contactgroups)

Change-Id: I3645304af7f392849edd19910a24b7bb86cdbda4
---
M hieradata/role/common/wdqs.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/244813/1

diff --git a/hieradata/role/common/wdqs.yaml b/hieradata/role/common/wdqs.yaml
index daa639b..6f99dbc 100644
--- a/hieradata/role/common/wdqs.yaml
+++ b/hieradata/role/common/wdqs.yaml
@@ -3,4 +3,4 @@
 admin::groups:
   - wdqs-admins
 cluster: wdqs
-contact_group: admins,wdqs-admins
+contactgroups: admins,wdqs-admins

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3645304af7f392849edd19910a24b7bb86cdbda4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] lists: use more sane values for queue checks - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: lists: use more sane values for queue checks
..

lists: use more sane values for queue checks

More sane is questionable here. All queues but out should never be above 25 in 
an
ideal world. Out is a random number picked since it did exceed the 100 this 
morning.

Change-Id: I82e026e2dfd2b9ac80692833228ff660ce0439f0
---
M manifests/role/lists.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/244701/1

diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index c2a350e..e76ea9d 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -115,7 +115,7 @@
 
 nrpe::monitor_service { 'mailman_queue':
 description   => 'mailman_queue_size',
-nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 100 100 100 100',
+nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 25 25 200 25',
 }
 
 # on list servers we monitor I/O with iostat

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82e026e2dfd2b9ac80692833228ff660ce0439f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mw_rc_irc: rename module to standard naming - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mw_rc_irc: rename module to standard naming
..

mw_rc_irc: rename module to standard naming

Change-Id: I9c855665f3c924e7852123a8a29d35e108aa6c10
---
R manifests/role/mw_rc_irc.pp
M manifests/site.pp
D modules/mw-rc-irc/manifests/apache.pp
R modules/mw_rc_irc/files/monitor/ircd_stats.py
R modules/mw_rc_irc/files/upstart/ircd.conf
R modules/mw_rc_irc/files/upstart/ircecho.conf
A modules/mw_rc_irc/manifests/apache.pp
R modules/mw_rc_irc/manifests/irc-echo.pp
R modules/mw_rc_irc/manifests/ircserver.pp
R modules/mw_rc_irc/templates/apache/irc.wikimedia.org.erb
R modules/mw_rc_irc/templates/motd.erb
R modules/mw_rc_irc/templates/udpmxircecho.py.erb
12 files changed, 20 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/244699/1

diff --git a/manifests/role/mw-rc-irc.pp b/manifests/role/mw_rc_irc.pp
similarity index 78%
rename from manifests/role/mw-rc-irc.pp
rename to manifests/role/mw_rc_irc.pp
index a93e767..dde3697 100644
--- a/manifests/role/mw-rc-irc.pp
+++ b/manifests/role/mw_rc_irc.pp
@@ -1,16 +1,16 @@
-class role::mw-rc-irc {
+class role::mw_rc_irc {
 
-system::role { 'role::mw-rc-irc': description => 'MW Changes IRC Broadcast 
Server' }
+system::role { 'role::mw_rc_irc': description => 'MW Changes IRC Broadcast 
Server' }
 
 include passwords::udpmxircecho
 $udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
 
-class { '::mw-rc-irc::irc-echo':
+class { '::mw_rc_irc::irc-echo':
 ircpassword => $udpmxircecho_pass,
 }
 
-include mw-rc-irc::ircserver
-include mw-rc-irc::apache
+include mw_rc_irc::ircserver
+include mw_rc_irc::apache
 
 # IRCd - public access
 ferm::service { 'ircd_public':
diff --git a/manifests/site.pp b/manifests/site.pp
index 007db51..4ece2e9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -222,7 +222,7 @@
 node 'argon.wikimedia.org' {
 include standard
 include base::firewall
-include role::mw-rc-irc
+include role::mw_rc_irc
 }
 
 node 'baham.wikimedia.org' {
diff --git a/modules/mw-rc-irc/manifests/apache.pp 
b/modules/mw-rc-irc/manifests/apache.pp
deleted file mode 100644
index 8c101b8..000
--- a/modules/mw-rc-irc/manifests/apache.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-# redirect http://irc.wikimedia.org to http://meta.wikimedia.org/wiki/IRC
-class mw-rc-irc::apache {
-apache::site { 'irc.wikimedia.org':
-content => template('mw-rc-irc/apache/irc.wikimedia.org.erb'),
-}
-}
-
diff --git a/modules/mw-rc-irc/files/monitor/ircd_stats.py 
b/modules/mw_rc_irc/files/monitor/ircd_stats.py
similarity index 100%
rename from modules/mw-rc-irc/files/monitor/ircd_stats.py
rename to modules/mw_rc_irc/files/monitor/ircd_stats.py
diff --git a/modules/mw-rc-irc/files/upstart/ircd.conf 
b/modules/mw_rc_irc/files/upstart/ircd.conf
similarity index 100%
rename from modules/mw-rc-irc/files/upstart/ircd.conf
rename to modules/mw_rc_irc/files/upstart/ircd.conf
diff --git a/modules/mw-rc-irc/files/upstart/ircecho.conf 
b/modules/mw_rc_irc/files/upstart/ircecho.conf
similarity index 100%
rename from modules/mw-rc-irc/files/upstart/ircecho.conf
rename to modules/mw_rc_irc/files/upstart/ircecho.conf
diff --git a/modules/mw_rc_irc/manifests/apache.pp 
b/modules/mw_rc_irc/manifests/apache.pp
new file mode 100644
index 000..e4409d8
--- /dev/null
+++ b/modules/mw_rc_irc/manifests/apache.pp
@@ -0,0 +1,7 @@
+# redirect http://irc.wikimedia.org to http://meta.wikimedia.org/wiki/IRC
+class mw_rc_irc::apache {
+apache::site { 'irc.wikimedia.org':
+content => template('mw_rc_irc/apache/irc.wikimedia.org.erb'),
+}
+}
+
diff --git a/modules/mw-rc-irc/manifests/irc-echo.pp 
b/modules/mw_rc_irc/manifests/irc-echo.pp
similarity index 79%
rename from modules/mw-rc-irc/manifests/irc-echo.pp
rename to modules/mw_rc_irc/manifests/irc-echo.pp
index 751438b..78b0580 100644
--- a/modules/mw-rc-irc/manifests/irc-echo.pp
+++ b/modules/mw_rc_irc/manifests/irc-echo.pp
@@ -1,20 +1,20 @@
 # A basic relay client that accept changes via udp and echo's them to an irc 
server
 
-class mw-rc-irc::irc-echo(
+class mw_rc_irc::irc-echo(
 $ircpassword,
 ) {
 
 package { 'python-irclib': ensure => latest; }
 
 file { '/usr/local/bin/udpmxircecho.py':
-content => template('mw-rc-irc/udpmxircecho.py.erb'),
+content => template('mw_rc_irc/udpmxircecho.py.erb'),
 mode=> '0555',
 owner   => 'irc',
 group   => 'irc';
 }
 
 file { '/etc/init/ircecho.conf':
-source  => 'puppet:///modules/mw-rc-irc/upstart/ircecho.conf',
+source  => 'puppet:///modules/mw_rc_irc/upstart/ircecho.conf',
 require => File['/usr/local/bin/udpmxircecho.py'],
 }
 
diff --git a/modules/mw-rc-irc/manifests/ircserver.pp 

[MediaWiki-commits] [Gerrit] icinga: ensure hiera lookups for all contact_group defs - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: icinga: ensure hiera lookups for all contact_group defs
..

icinga: ensure hiera lookups for all contact_group defs

Some defs like in base are likely overwriting and acting as global values.
This would mean hiera is either not looked at all or is overwritten.

Change-Id: Icb3b039a067af656b727fa6b1ebea7d1d9187f65
---
M modules/base/manifests/monitoring/host.pp
M modules/monitoring/manifests/host.pp
M modules/monitoring/manifests/service.pp
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/244722/1

diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 30a9d57..9381cdf 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -20,7 +20,7 @@
 # all disks and warning at < 6% and critical at < 
3% free.
 #
 class base::monitoring::host(
-$contact_group = 'admins',
+$contact_group = hiera('contactgroups', 'admins'),
 # the -A -i ... part is a gross hack to workaround Varnish partitions
 # that are purposefully at 99%. Better ideas are welcome.
 $nrpe_check_disk_options = '-w 6% -c 3% -l -e -A -i "/srv/sd[a-b][1-3]"',
diff --git a/modules/monitoring/manifests/host.pp 
b/modules/monitoring/manifests/host.pp
index f0ff8c4..7f557ce 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -7,7 +7,7 @@
 $group = undef,
 $ensure= present,
 $critical  = false,
-$contact_group = 'admins'
+$contact_group = hiera('contactgroups', 'admins')
 ) {
 
 $nagios_address = $host_fqdn ? {
diff --git a/modules/monitoring/manifests/service.pp 
b/modules/monitoring/manifests/service.pp
index a15a63d..3748286 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -10,7 +10,7 @@
 $freshness = 36000,
 $normal_check_interval = 1,
 $retry_check_interval  = 1,
-$contact_group = 'admins',
+$contact_group = hiera('contactgroups', 'admins'),
 $config_dir= '/etc/nagios',
 )
 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb3b039a067af656b727fa6b1ebea7d1d9187f65
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] base: don't set contact_groups unless they override icinga d... - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: base: don't set contact_groups unless they override icinga 
defaults
..

base: don't set contact_groups unless they override icinga defaults

Change-Id: Ie722134c76b48ab63f7cd2e731d3b2bac4e095b1
---
M modules/base/manifests/monitoring/host.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/244732/1

diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 9381cdf..d42857c 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -27,13 +27,11 @@
 ) {
 include base::puppet::params # In order to be able to use some variables
 
-monitoring::host { $::hostname:
-contact_group => $contact_group
-}
+monitoring::host { $::hostname: }
+
 monitoring::service { 'ssh':
 description   => 'SSH',
 check_command => 'check_ssh',
-contact_group => $contact_group
 }
 
 package { [ 'megacli', 'arcconf', 'mpt-status' ]:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie722134c76b48ab63f7cd2e731d3b2bac4e095b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] nrpe: convert contact_groups to hiera - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: nrpe: convert contact_groups to hiera
..

nrpe: convert contact_groups to hiera

Change-Id: I50bf1cb67de05972ea177bba4815076bba54570f
---
M modules/nrpe/manifests/monitor_service.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/244734/1

diff --git a/modules/nrpe/manifests/monitor_service.pp 
b/modules/nrpe/manifests/monitor_service.pp
index 2a02aa1..11b2533 100644
--- a/modules/nrpe/manifests/monitor_service.pp
+++ b/modules/nrpe/manifests/monitor_service.pp
@@ -27,7 +27,7 @@
 #
 define nrpe::monitor_service( $description,
   $nrpe_command,
-  $contact_group = 'admins',
+  $contact_group = hiera('contactgroups', 
'admins'),,
   $retries   = 3,
   $timeout   = 10,
   $critical  = false,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50bf1cb67de05972ea177bba4815076bba54570f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mw_rc_irc: standarise puppet naming - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mw_rc_irc: standarise puppet naming
..

mw_rc_irc: standarise puppet naming

Change-Id: I0df5fa95d433a429fe683db74a77a5de9d3fa970
---
R manifests/role/mw_rc_irc.pp
M manifests/site.pp
M modules/cdh
D modules/mw-rc-irc/manifests/apache.pp
R modules/mw_rc_irc/files/monitor/ircd_stats.py
R modules/mw_rc_irc/files/upstart/ircd.conf
R modules/mw_rc_irc/files/upstart/ircecho.conf
A modules/mw_rc_irc/manifests/apache.pp
R modules/mw_rc_irc/manifests/irc-echo.pp
R modules/mw_rc_irc/manifests/ircserver.pp
R modules/mw_rc_irc/templates/apache/irc.wikimedia.org.erb
R modules/mw_rc_irc/templates/motd.erb
R modules/mw_rc_irc/templates/udpmxircecho.py.erb
13 files changed, 20 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/244695/1

diff --git a/manifests/role/mw-rc-irc.pp b/manifests/role/mw_rc_irc.pp
similarity index 78%
rename from manifests/role/mw-rc-irc.pp
rename to manifests/role/mw_rc_irc.pp
index a93e767..dde3697 100644
--- a/manifests/role/mw-rc-irc.pp
+++ b/manifests/role/mw_rc_irc.pp
@@ -1,16 +1,16 @@
-class role::mw-rc-irc {
+class role::mw_rc_irc {
 
-system::role { 'role::mw-rc-irc': description => 'MW Changes IRC Broadcast 
Server' }
+system::role { 'role::mw_rc_irc': description => 'MW Changes IRC Broadcast 
Server' }
 
 include passwords::udpmxircecho
 $udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
 
-class { '::mw-rc-irc::irc-echo':
+class { '::mw_rc_irc::irc-echo':
 ircpassword => $udpmxircecho_pass,
 }
 
-include mw-rc-irc::ircserver
-include mw-rc-irc::apache
+include mw_rc_irc::ircserver
+include mw_rc_irc::apache
 
 # IRCd - public access
 ferm::service { 'ircd_public':
diff --git a/manifests/site.pp b/manifests/site.pp
index 007db51..4ece2e9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -222,7 +222,7 @@
 node 'argon.wikimedia.org' {
 include standard
 include base::firewall
-include role::mw-rc-irc
+include role::mw_rc_irc
 }
 
 node 'baham.wikimedia.org' {
diff --git a/modules/cdh b/modules/cdh
index ca31b4d..ccfe4d1 16
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit ca31b4dcb3d3587ddf2332c510a4f22b2694765f
+Subproject commit ccfe4d1084a81015397befc68fb3381477f1045d
diff --git a/modules/mw-rc-irc/manifests/apache.pp 
b/modules/mw-rc-irc/manifests/apache.pp
deleted file mode 100644
index 8c101b8..000
--- a/modules/mw-rc-irc/manifests/apache.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-# redirect http://irc.wikimedia.org to http://meta.wikimedia.org/wiki/IRC
-class mw-rc-irc::apache {
-apache::site { 'irc.wikimedia.org':
-content => template('mw-rc-irc/apache/irc.wikimedia.org.erb'),
-}
-}
-
diff --git a/modules/mw-rc-irc/files/monitor/ircd_stats.py 
b/modules/mw_rc_irc/files/monitor/ircd_stats.py
similarity index 100%
rename from modules/mw-rc-irc/files/monitor/ircd_stats.py
rename to modules/mw_rc_irc/files/monitor/ircd_stats.py
diff --git a/modules/mw-rc-irc/files/upstart/ircd.conf 
b/modules/mw_rc_irc/files/upstart/ircd.conf
similarity index 100%
rename from modules/mw-rc-irc/files/upstart/ircd.conf
rename to modules/mw_rc_irc/files/upstart/ircd.conf
diff --git a/modules/mw-rc-irc/files/upstart/ircecho.conf 
b/modules/mw_rc_irc/files/upstart/ircecho.conf
similarity index 100%
rename from modules/mw-rc-irc/files/upstart/ircecho.conf
rename to modules/mw_rc_irc/files/upstart/ircecho.conf
diff --git a/modules/mw_rc_irc/manifests/apache.pp 
b/modules/mw_rc_irc/manifests/apache.pp
new file mode 100644
index 000..e4409d8
--- /dev/null
+++ b/modules/mw_rc_irc/manifests/apache.pp
@@ -0,0 +1,7 @@
+# redirect http://irc.wikimedia.org to http://meta.wikimedia.org/wiki/IRC
+class mw_rc_irc::apache {
+apache::site { 'irc.wikimedia.org':
+content => template('mw_rc_irc/apache/irc.wikimedia.org.erb'),
+}
+}
+
diff --git a/modules/mw-rc-irc/manifests/irc-echo.pp 
b/modules/mw_rc_irc/manifests/irc-echo.pp
similarity index 79%
rename from modules/mw-rc-irc/manifests/irc-echo.pp
rename to modules/mw_rc_irc/manifests/irc-echo.pp
index 751438b..78b0580 100644
--- a/modules/mw-rc-irc/manifests/irc-echo.pp
+++ b/modules/mw_rc_irc/manifests/irc-echo.pp
@@ -1,20 +1,20 @@
 # A basic relay client that accept changes via udp and echo's them to an irc 
server
 
-class mw-rc-irc::irc-echo(
+class mw_rc_irc::irc-echo(
 $ircpassword,
 ) {
 
 package { 'python-irclib': ensure => latest; }
 
 file { '/usr/local/bin/udpmxircecho.py':
-content => template('mw-rc-irc/udpmxircecho.py.erb'),
+content => template('mw_rc_irc/udpmxircecho.py.erb'),
 mode=> '0555',
 owner   => 'irc',
 group   => 'irc';
 }
 
 file { '/etc/init/ircecho.conf':
-source  => 

[MediaWiki-commits] [Gerrit] wdq_mm: rename module to standard naming (underscores) - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: wdq_mm: rename module to standard naming (underscores)
..

wdq_mm: rename module to standard naming (underscores)

Change-Id: Ifad416c7eaadc227fbcb806596821c40d59190a5
---
R manifests/role/labswdq_mm.pp
D modules/wdq-mm/manifests/lb.pp
R modules/wdq_mm/files/monitrc
R modules/wdq_mm/manifests/init.pp
A modules/wdq_mm/manifests/lb.pp
R modules/wdq_mm/templates/lb.nginx.erb
6 files changed, 20 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/244242/1

diff --git a/manifests/role/labswdq-mm.pp b/manifests/role/labswdq_mm.pp
similarity index 67%
rename from manifests/role/labswdq-mm.pp
rename to manifests/role/labswdq_mm.pp
index 2cf28e4..3aad94f 100644
--- a/manifests/role/labswdq-mm.pp
+++ b/manifests/role/labswdq_mm.pp
@@ -1,7 +1,7 @@
-# == Class: role::labs::wdq-mm
+# == Class: role::labs::wdq_mm
 # Role class for setting up an instance of
 # Magnus' WDQ on labs
-class role::labs::wdq-mm {
+class role::labs::wdq_mm {
 include misc::labsdebrepo
 
 include labs_lvm
@@ -10,7 +10,7 @@
 size=> '80%FREE',
 }
 
-class { '::wdq-mm':
+class { '::wdq_mm':
 require => [
 Class['misc::labsdebrepo'],
 Labs_lvm::Volume['instance-storage'],
@@ -18,10 +18,10 @@
 }
 }
 
-# == Class: role::labs::wdq-mm::lb
+# == Class: role::labs::wdq_mm::lb
 # Load balancer for balancing across multiple instances
-# of role::labs::wdq-mm
-class role::labs::wdq-mm::lb {
-class { '::wdq-mm::lb':
+# of role::labs::wdq_mm
+class role::labs::wdq_mm::lb {
+class { '::wdq_mm::lb':
 }
 }
diff --git a/modules/wdq-mm/manifests/lb.pp b/modules/wdq-mm/manifests/lb.pp
deleted file mode 100644
index 696a54c..000
--- a/modules/wdq-mm/manifests/lb.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-# = Class: wdq-mm::lb
-#
-# Simple nginx based loadbalancer for wdq-mm
-class wdq-mm::lb(
-$realservers = [],
-) {
-nginx::site { 'wdq-mm-lb':
-content => template('wdq-mm/lb.nginx.erb'),
-}
-}
diff --git a/modules/wdq-mm/files/monitrc b/modules/wdq_mm/files/monitrc
similarity index 100%
rename from modules/wdq-mm/files/monitrc
rename to modules/wdq_mm/files/monitrc
diff --git a/modules/wdq-mm/manifests/init.pp b/modules/wdq_mm/manifests/init.pp
similarity index 85%
rename from modules/wdq-mm/manifests/init.pp
rename to modules/wdq_mm/manifests/init.pp
index 4166081..f56fec4 100644
--- a/modules/wdq-mm/manifests/init.pp
+++ b/modules/wdq_mm/manifests/init.pp
@@ -1,7 +1,7 @@
-# == Class: wdq-mm
+# == Class: wdq_mm
 #
 # Class for setting up an instance of Magnus' WDQ
-class wdq-mm {
+class wdq_mm {
 package { 'wdq-mm':
 ensure => latest,
 }
@@ -21,7 +21,7 @@
 }
 
 file { '/etc/monit/conf.d/wdq-mm':
-source  => 'puppet:///modules/wdq-mm/monitrc',
+source  => 'puppet:///modules/wdq_mm/monitrc',
 require => [
 Package['monit'],
 Package['wdq-mm'],
diff --git a/modules/wdq_mm/manifests/lb.pp b/modules/wdq_mm/manifests/lb.pp
new file mode 100644
index 000..97e3ebf
--- /dev/null
+++ b/modules/wdq_mm/manifests/lb.pp
@@ -0,0 +1,10 @@
+# = Class: wdq_mm::lb
+#
+# Simple nginx based loadbalancer for wdq-mm
+class wdq_mm::lb(
+$realservers = [],
+) {
+nginx::site { 'wdq-mm-lb':
+content => template('wdq_mm/lb.nginx.erb'),
+}
+}
diff --git a/modules/wdq-mm/templates/lb.nginx.erb 
b/modules/wdq_mm/templates/lb.nginx.erb
similarity index 100%
rename from modules/wdq-mm/templates/lb.nginx.erb
rename to modules/wdq_mm/templates/lb.nginx.erb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifad416c7eaadc227fbcb806596821c40d59190a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] admin: create account for vbaranetsky + add groups - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: create account for vbaranetsky + add groups
..

admin: create account for vbaranetsky + add groups

Manager approval in ticket via Rob.

Bug: T114308
Change-Id: I1dae80120e482b43aee01bd4f4cc96c8bb2cb3ee
---
M modules/admin/data/data.yaml
1 file changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/244227/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 82d0d0d..6d8298a 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -73,7 +73,8 @@
   joal, thcipriani, daisy, ashwinpp, jhobs, tomasz, lpintscher,
   pcoombe, mholloway-shell, madhuvishy, niedzielski, 
neilpquinn-wmf,
   gpaumier, moushira, aklapper, qchris, tjones, srijan, johnflewis,
-  addshore, jminor, pt1979, asherman, etonkovidova, sbisson, 
zhousquared]
+  addshore, jminor, pt1979, asherman, etonkovidova, sbisson, 
zhousquared,
+  vbaranetsky]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts
@@ -229,7 +230,8 @@
   ezachte, mforns, reedy, west1, phuedx, awight, spage, junikowski,
   joal, jamesur, akosiaris, jhobs, lpintscher, jkatz, madhuvishy, 
gpaumier,
   andyrussg, niedzielski, maxsem, hoo, daniel, tbayer, krinkle, 
tgr,
-  csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus, 
neilpquinn-wmf]
+  csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus, 
neilpquinn-wmf,
+  vbaranetsky]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.
@@ -1658,3 +1660,10 @@
 realname: Dan Foy
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDcPoXJg9IgK5+067Fe5pzHVDmCEKbjFJClxcrTOoAqe9+xZfWIdMJKWV1h4Wj0fYiGJZDBwwrvwlPN+9pMiR1OwjB3BA0XTWVGBWeLwMsNRvCs9RDSLl7iI8N8v0oa58PAMquVDsVufILCC5H1fz8LfxywPrwDaR0y5vDXTlj2/FirXuZLC8lgOJXdLNp31SRoSZ/0Q/gISqBknGnqF9vTFRPq31B9OP3EAzpPAXVneGCcKp+EeG02AXss0S2Dvz8XDYWuduQVYVJCpJkHHdxdhCMA30BD6eiaJ0iyWS2NpAngBrCTXnlacdRJXsiVyBXpisyHRLQdyjHK6p2ijwJN
 d...@wikimedia.org]
 uid: 2318
+  vbaranetsky:
+ensure: present
+gid: 500
+name: vbaranetsky
+realname: D. Victoria Baranetsky
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDXDLLO7xO3ORplUgyymQvLJZ7WB2FExGHjlxTKOSRwFGVPdAqbjAZVy84y+1+jAdbkwtMYtM+NaEZQ0iXsdCU6oY9mCoolJSc5LlvWv2I6mN2m9PW/2m2CH7wLaKlrv/a4flA07T4ZZwzPYXaqzCpNAOQzoOAwCoNuBBSz27Vocoqw3tNYo/7dxzTdq3EB+MeJFxQzCqK0LZe9DMfkImHNCwEWS+11JxZyfN752n+v5RBWjP4jGz5pRPN4gM0bOeYTyMHtzUR/+cWsSLx3I55ZmZ3FvYRVa7ALTKbqvmYm5il5rVbg7ViLLud1NbKrJPewJPGC5BJWB43khMiiQurB
 vbaranet...@adminisorsair24.corp.wikimedia.org]
+uid: 13214

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dae80120e482b43aee01bd4f4cc96c8bb2cb3ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mw_rc_irc: rename to standard naming scheme (underscores) - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mw_rc_irc: rename to standard naming scheme (underscores)
..

mw_rc_irc: rename to standard naming scheme (underscores)

Change-Id: I649cd02a9601da66c8eaec3e86e6065a09a7ac72
---
R manifests/role/mw_rc_irc.pp
M manifests/site.pp
D modules/mw-rc-irc/manifests/apache.pp
R modules/mw_rc_irc/files/monitor/ircd_stats.py
R modules/mw_rc_irc/files/upstart/ircd.conf
R modules/mw_rc_irc/files/upstart/ircecho.conf
A modules/mw_rc_irc/manifests/apache.pp
R modules/mw_rc_irc/manifests/irc-echo.pp
R modules/mw_rc_irc/manifests/ircserver.pp
R modules/mw_rc_irc/templates/apache/irc.wikimedia.org.erb
R modules/mw_rc_irc/templates/motd.erb
R modules/mw_rc_irc/templates/udpmxircecho.py.erb
12 files changed, 20 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/244236/1

diff --git a/manifests/role/mw-rc-irc.pp b/manifests/role/mw_rc_irc.pp
similarity index 62%
rename from manifests/role/mw-rc-irc.pp
rename to manifests/role/mw_rc_irc.pp
index b1033a2..c772463 100644
--- a/manifests/role/mw-rc-irc.pp
+++ b/manifests/role/mw_rc_irc.pp
@@ -1,16 +1,16 @@
-class role::mw-rc-irc {
+class role::mw_rc_irc {
 
-system::role { 'role::mw-rc-irc': description => 'MW Changes IRC Broadcast 
Server' }
+system::role { 'role::mw_rc_irc': description => 'MW Changes IRC Broadcast 
Server' }
 
 include passwords::udpmxircecho
 $udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
 
-class { '::mw-rc-irc::irc-echo':
+class { '::mw_rc_irc::irc-echo':
 ircpassword => $udpmxircecho_pass,
 }
 
-include mw-rc-irc::ircserver
-include mw-rc-irc::apache
+include mw_rc_irc::ircserver
+include mw_rc_irc::apache
 
 ferm::service { 'ircd_public':
 proto => 'tcp',
diff --git a/manifests/site.pp b/manifests/site.pp
index 377ef8d..e64d4a8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -221,7 +221,7 @@
 # irc.wikimedia.org
 node 'argon.wikimedia.org' {
 include standard
-include role::mw-rc-irc
+include role::mw_rc_irc
 }
 
 node 'baham.wikimedia.org' {
diff --git a/modules/mw-rc-irc/manifests/apache.pp 
b/modules/mw-rc-irc/manifests/apache.pp
deleted file mode 100644
index 8c101b8..000
--- a/modules/mw-rc-irc/manifests/apache.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-# redirect http://irc.wikimedia.org to http://meta.wikimedia.org/wiki/IRC
-class mw-rc-irc::apache {
-apache::site { 'irc.wikimedia.org':
-content => template('mw-rc-irc/apache/irc.wikimedia.org.erb'),
-}
-}
-
diff --git a/modules/mw-rc-irc/files/monitor/ircd_stats.py 
b/modules/mw_rc_irc/files/monitor/ircd_stats.py
similarity index 100%
rename from modules/mw-rc-irc/files/monitor/ircd_stats.py
rename to modules/mw_rc_irc/files/monitor/ircd_stats.py
diff --git a/modules/mw-rc-irc/files/upstart/ircd.conf 
b/modules/mw_rc_irc/files/upstart/ircd.conf
similarity index 100%
rename from modules/mw-rc-irc/files/upstart/ircd.conf
rename to modules/mw_rc_irc/files/upstart/ircd.conf
diff --git a/modules/mw-rc-irc/files/upstart/ircecho.conf 
b/modules/mw_rc_irc/files/upstart/ircecho.conf
similarity index 100%
rename from modules/mw-rc-irc/files/upstart/ircecho.conf
rename to modules/mw_rc_irc/files/upstart/ircecho.conf
diff --git a/modules/mw_rc_irc/manifests/apache.pp 
b/modules/mw_rc_irc/manifests/apache.pp
new file mode 100644
index 000..e4409d8
--- /dev/null
+++ b/modules/mw_rc_irc/manifests/apache.pp
@@ -0,0 +1,7 @@
+# redirect http://irc.wikimedia.org to http://meta.wikimedia.org/wiki/IRC
+class mw_rc_irc::apache {
+apache::site { 'irc.wikimedia.org':
+content => template('mw_rc_irc/apache/irc.wikimedia.org.erb'),
+}
+}
+
diff --git a/modules/mw-rc-irc/manifests/irc-echo.pp 
b/modules/mw_rc_irc/manifests/irc-echo.pp
similarity index 79%
rename from modules/mw-rc-irc/manifests/irc-echo.pp
rename to modules/mw_rc_irc/manifests/irc-echo.pp
index 751438b..78b0580 100644
--- a/modules/mw-rc-irc/manifests/irc-echo.pp
+++ b/modules/mw_rc_irc/manifests/irc-echo.pp
@@ -1,20 +1,20 @@
 # A basic relay client that accept changes via udp and echo's them to an irc 
server
 
-class mw-rc-irc::irc-echo(
+class mw_rc_irc::irc-echo(
 $ircpassword,
 ) {
 
 package { 'python-irclib': ensure => latest; }
 
 file { '/usr/local/bin/udpmxircecho.py':
-content => template('mw-rc-irc/udpmxircecho.py.erb'),
+content => template('mw_rc_irc/udpmxircecho.py.erb'),
 mode=> '0555',
 owner   => 'irc',
 group   => 'irc';
 }
 
 file { '/etc/init/ircecho.conf':
-source  => 'puppet:///modules/mw-rc-irc/upstart/ircecho.conf',
+source  => 'puppet:///modules/mw_rc_irc/upstart/ircecho.conf',
 require => File['/usr/local/bin/udpmxircecho.py'],
 }
 
diff --git 

[MediaWiki-commits] [Gerrit] bump cdh submodule (lint fixes) - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: bump cdh submodule (lint fixes)
..

bump cdh submodule (lint fixes)

Change-Id: Idf4ae4c477ccbcc8f59f1e8a9dc68fd220282c72
---
M modules/cdh
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/243799/1

diff --git a/modules/cdh b/modules/cdh
index 6382780..ccfe4d1 16
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit 6382780d404d04ecf71c0416e92b4b2972324885
+Subproject commit ccfe4d1084a81015397befc68fb3381477f1045d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf4ae4c477ccbcc8f59f1e8a9dc68fd220282c72
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] lint: enclose variables - change (operations...cdh)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: lint: enclose variables
..

lint: enclose variables

Change-Id: If3fd5139ee8e68d5b670fd1da5d04678b3e2edee
---
M manifests/hadoop.pp
M manifests/hue/defaults.pp
M manifests/oozie.pp
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh 
refs/changes/97/243797/1

diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index 1fd82f8..e794ea0 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -293,7 +293,7 @@
 content => template('cdh/hadoop/core-site.xml.erb'),
 }
 
-file { "$config_directory/hdfs-site.xml":
+file { "${config_directory}/hdfs-site.xml":
 content => template('cdh/hadoop/hdfs-site.xml.erb'),
 }
 
diff --git a/manifests/hue/defaults.pp b/manifests/hue/defaults.pp
index 8b010c9..0b694fd 100644
--- a/manifests/hue/defaults.pp
+++ b/manifests/hue/defaults.pp
@@ -12,7 +12,7 @@
 # set in the cdh::oozie class.
 if (defined(Class['cdh::oozie'])) {
 $oozie_url  = $cdh::oozie::url
-$oozie_proxy_regex  = "$cdh::oozie::oozie_host:(11000|11443)"
+$oozie_proxy_regex  = "${cdh::oozie::oozie_host}:(11000|11443)"
 }
 # Otherwise disable Oozie interface for Hue.
 else {
@@ -63,4 +63,4 @@
 $hue_log4j_template = 'cdh/hue/log4j.properties.erb'
 $hue_log_conf_template  = 'cdh/hue/log.conf.erb'
 
-}
\ No newline at end of file
+}
diff --git a/manifests/oozie.pp b/manifests/oozie.pp
index 5e20556..16d4982 100644
--- a/manifests/oozie.pp
+++ b/manifests/oozie.pp
@@ -7,7 +7,7 @@
 )
 {
 # oozie server url
-$url = "http://$oozie_host:11000/oozie;
+$url = "http://${oozie_host}:11000/oozie;
 
 package { 'oozie-client':
 ensure => 'installed',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3fd5139ee8e68d5b670fd1da5d04678b3e2edee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] admin: add dcausse to analytics-privatedata-users - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add dcausse to analytics-privatedata-users
..

admin: add dcausse to analytics-privatedata-users

Bug: T114642
Change-Id: Ib58eccf6310db75b0cee0b7da220207cae65ccb3
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/243686/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index c3d1d88..155baf3 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -229,7 +229,7 @@
   ezachte, mforns, reedy, west1, phuedx, awight, spage,
   joal, jamesur, akosiaris, jhobs, lpintscher, jkatz, madhuvishy, 
gpaumier,
   andyrussg, niedzielski, maxsem, hoo, daniel, tbayer, krinkle, 
tgr,
-  csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus, 
neilpquinn-wmf]
+  csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus, 
neilpquinn-wmf, dcausse]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib58eccf6310db75b0cee0b7da220207cae65ccb3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] wikistats: remove Orain - change (operations...wikistats)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: wikistats: remove Orain
..

wikistats: remove Orain

Service is dead, causing failures on wikistats.

Change-Id: I3a81b7503288daba968360cc6810b3bbe09f645a
---
M etc/wikistats/config.php
M usr/lib/wikistats/update.php
M usr/lib/wikistats/update_functions.php
M usr/share/php/wikistats/coalesced_query.php
M usr/share/php/wikistats/largest_query.php
M var/www/wikistats/detail.php
M var/www/wikistats/display.php
M var/www/wikistats/displayw.php
M var/www/wikistats/largest_html.php
9 files changed, 2 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats 
refs/changes/76/242176/1

diff --git a/etc/wikistats/config.php b/etc/wikistats/config.php
index 1a2869e..5470720 100644
--- a/etc/wikistats/config.php
+++ b/etc/wikistats/config.php
@@ -60,10 +60,10 @@
 $socket_timeout="10";
 
 # list all tables (which should be displayed on index page and included in 
grand totals)
-$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','lxde','wikivoyage','w3cwikis',
 'gamepedias', 'sourceforge', 'orain', 'miraheze');
+$listtables=array('wikipedias','wikiquotes','wikibooks','wiktionaries','wikinews','wikisources','wikia','editthis','wikitravel','mediawikis','uncyclomedia','anarchopedias','opensuse','richdex','gratiswiki','qweki','wikisite','hyperwave','scoutwiki','wmspecials','qweki','wikiversity','wikifur','metapedias','neoseeker','shoutwiki','referata','pardus','rodovid','lxde','wikivoyage','w3cwikis',
 'gamepedias', 'sourceforge', 'miraheze');
 
 # list tables which are valid for our api.php - CHECKME
-$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage','w3cwikis','gamepedias',
 'sourceforge', 'orain', 'miraheze');
+$valid_api_tables=array('wikipedias','mediawikis','wiktionaries','wikia','wikisources','wmspecials','uncyclomedia','wikibooks','wikiquotes','editthis','wikinews','wikisite','wikitravel','scoutwiki','anarchopedias','opensuse','gratiswiki','wikimedias','metapedias','wikifur','neoseeker','wikiversity','wikivoyage','w3cwikis','gamepedias',
 'sourceforge', 'miraheze');
 
 # list tables which should have language columns in the html tables
 
$tables_with_language_columns=array('wikipedias','wiktionaries','wikisources','uncyclomedia','wikibooks','wikiquotes','wikinews','wikitravel','anarchopedias','wikimedias','wikifur','wikiversity','pardus','rodovid','lxde','wikivoyage','metapedias');
diff --git a/usr/lib/wikistats/update.php b/usr/lib/wikistats/update.php
index 76e45b2..5f5d1ba 100644
--- a/usr/lib/wikistats/update.php
+++ b/usr/lib/wikistats/update.php
@@ -172,10 +172,6 @@
 $table="sourceforge";
 $domain="sourceforge.net";
 break;
-case "or":
-$table="orain";
-$domain="orain.org";
-break;
 case "wi":
 $table="wikia";
 $domain="wikia.com";
diff --git a/usr/lib/wikistats/update_functions.php 
b/usr/lib/wikistats/update_functions.php
index 467df7b..990e61e 100755
--- a/usr/lib/wikistats/update_functions.php
+++ b/usr/lib/wikistats/update_functions.php
@@ -144,10 +144,6 @@
 $table="sourceforge";
 $domain="sourceforge.net";
 break;
-case "or":
-$table="orain";
-$domain="orain.org";
-break;
 case "mh":
 $table="miraheze";
 $domain="miraheze.org";
diff --git a/usr/share/php/wikistats/coalesced_query.php 
b/usr/share/php/wikistats/coalesced_query.php
index f8199ae..b22b226 100644
--- a/usr/share/php/wikistats/coalesced_query.php
+++ b/usr/share/php/wikistats/coalesced_query.php
@@ -58,8 +58,6 @@
 union all
 (select 'sf' as project,'sourceforge' as name,sum(good) as ggood, sum(total) 
as gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from sourceforge)
 union all
-(select 'or' as project,'orain' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from orain)
-union all
 (select 'mh' as project,'miraheze' as name,sum(good) as ggood, sum(total) as 
gtotal, sum(edits) as gedits, sum(admins) as gadmins, sum(users) as 
gusers,sum(images) as gimages, count(id) as numwikis from miraheze)
 order by ${sort};";
 
diff --git 

[MediaWiki-commits] [Gerrit] admin: add dpatrick to statistics-users - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add dpatrick to statistics-users
..

admin: add dpatrick to statistics-users

Bug: T114119
Change-Id: Iaa3fec8e6282fe8f1cd3da0639ed3d029cab183c
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/242163/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 73d31a6..a130bbf 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -188,7 +188,7 @@
   dbrant, tgr, handrade, dr0ptp4kt, brion, bsitzmann,
   deskana, jzerebecki, dduvall, nettrom, mforns, jkatz, 
ebernhardson,
   mlitn, tbayer, joal, tomasz, kartik, nikerabbit, pcoombe, 
madhuvishy,
-  neilpquinn-wmf, maxsem, jminor]
+  neilpquinn-wmf, maxsem, jminor, dpatrick]
   statistics-admins:
 posix_name: stats
 description: access files created by stats user cron jobs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa3fec8e6282fe8f1cd3da0639ed3d029cab183c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] admin: add neilpquinn-wmf to analytic-privatedata-users - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add neilpquinn-wmf to analytic-privatedata-users
..

admin: add neilpquinn-wmf to analytic-privatedata-users

Bug: T113533
Change-Id: I75ca7d34e5bcc158aa91ca799835682fdf2d248a
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/241741/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 167b323..73d31a6 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -229,7 +229,7 @@
   ezachte, mforns, reedy, west1, phuedx, awight,
   joal, jamesur, akosiaris, jhobs, lpintscher, jkatz, madhuvishy, 
gpaumier,
   andyrussg, niedzielski, maxsem, hoo, daniel, tbayer, krinkle, 
tgr,
-  csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus]
+  csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus, 
neilpquinn-wmf]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75ca7d34e5bcc158aa91ca799835682fdf2d248a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] admin: add asherman to bastiononly - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add asherman to bastiononly
..

admin: add asherman to bastiononly

Has access to researchers but doesn't inherit access to bastion machines. This
is necessary to access internal machines.

Change-Id: Idc50cb804e19d771332681e00862421ff5d549b0
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/241562/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index cd7ae96..167b323 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -73,7 +73,7 @@
   joal, thcipriani, daisy, ashwinpp, jhobs, tomasz, lpintscher,
   pcoombe, mholloway-shell, madhuvishy, niedzielski, 
neilpquinn-wmf,
   gpaumier, moushira, aklapper, qchris, tjones, srijan, johnflewis,
-  addshore, jminor, pt1979]
+  addshore, jminor, pt1979, asherman]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc50cb804e19d771332681e00862421ff5d549b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: sudo mailman_check_queue as list - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: sudo mailman_check_queue as list
..

mailman: sudo mailman_check_queue as list

only list / root can ls the directories. Use list as delegated sudo rather than 
root.

Bug: T113326
Change-Id: Ia617bba69d802be4f835730f9c177642cae1f508
---
M manifests/role/lists.pp
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/240430/1

diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 6dc1e68..31e38c0 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -108,9 +108,14 @@
 source => 'puppet:///files/icinga/check_mailman_queue',
 }
 
+sudo::user { 'nagios_mailman_queue':
+user   => 'nagios',
+privileges => ['ALL = (list) NOPASSWD: 
/usr/local/lib/nagios/plugins/check_mailman_queue'],
+}
+
 nrpe::monitor_service { 'mailman_queue':
 description   => 'mailman_queue_size',
-nrpe_command  => '/usr/local/lib/nagios/plugins/check_mailman_queue 
42',
+nrpe_command  => '/usr/bin/sudo -u list 
/usr/local/lib/nagios/plugins/check_mailman_queue 42',
 }
 
 # on list servers we monitor I/O with iostat

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia617bba69d802be4f835730f9c177642cae1f508
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: don't monitor shunt, monitor bounces - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: don't monitor shunt, monitor bounces
..

mailman: don't monitor shunt, monitor bounces

Bug: T113326
Change-Id: Id6415e6fb12f7996668ab44032408d55c00f290a
---
M files/icinga/check_mailman_queue
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/240470/1

diff --git a/files/icinga/check_mailman_queue b/files/icinga/check_mailman_queue
index 650a014..c08c605 100755
--- a/files/icinga/check_mailman_queue
+++ b/files/icinga/check_mailman_queue
@@ -10,7 +10,7 @@
 # /files/icinga/check_mailman_queue 
 
 mailman_base="/var/lib/mailman/qfiles"
-FILES="$mailman_base/in $mailman_base/out $mailman_base/virgin 
$mailman_base/shunt"
+FILES="$mailman_base/bounces $mailman_base/in $mailman_base/out 
$mailman_base/virgin"
 
 queue_limit=$1
 critqueues=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6415e6fb12f7996668ab44032408d55c00f290a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] remove sodium from puppet (spare/decom) - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: remove sodium from puppet (spare/decom)
..

remove sodium from puppet (spare/decom)

Change-Id: I6f04b2bcd86519921edf3ed3c4d452fbedaaf2ff
---
M manifests/role/lists.pp
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 1 insertion(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/239411/1

diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 15763fe..c20258a 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -131,7 +131,7 @@
 default   => 'sda',
 }
 
-# values chosen based on i/o averages for sodium
+# values chosen based on i/o averages for fermium
 nrpe::monitor_service { 'mailman_iostat':
 description   => 'mailman I/O stats',
 nrpe_command  => "/usr/local/lib/nagios/plugins/check_iostat -i -w 
250,350,300,14000,7500 -c 500,400,600,28000,11000 -d ${iostat_device}",
diff --git a/manifests/site.pp b/manifests/site.pp
index ac09f0a..7433bf7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2378,15 +2378,6 @@
 interface::add_ip6_mapped { 'main': }
 }
 
-node 'sodium.wikimedia.org' {
-role lists
-include standard
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
 node /^(strontium|rhodium).eqiad.wmnet/ {
 include standard
 include role::puppetmaster::backend
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 673776e..60673f5 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -117,5 +117,4 @@
virt101[0-2]) echo partman/virt-hp.cfg ;; \
wdqs100[1-9]) echo partman/lvm-wdqs.cfg ;; \
wtp[1-2]0[0-2][0-9]|hafnium) echo partman/raid1-lvm.cfg ;; \
-#  sodium) echo partman/mailserver.cfg ;; \
esac
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 9251d94..b02ad96 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6172,11 +6172,6 @@
fixed-address snapshot1004.eqiad.wmnet;
 }
 
-host sodium {
-   hardware ethernet 78:2b:cb:08:aa:e1;
-   fixed-address sodium.wikimedia.org;
-}
-
 host stat1001 {
hardware ethernet 78:2b:cb:35:c4:f7;
fixed-address stat1001.eqiad.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f04b2bcd86519921edf3ed3c4d452fbedaaf2ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] remove sodium.wm.o (leaving sodium.mgmt.eqiad.wmnet) - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: remove sodium.wm.o (leaving sodium.mgmt.eqiad.wmnet)
..

remove sodium.wm.o (leaving sodium.mgmt.eqiad.wmnet)

Change-Id: I90a2c1ca5b17a56c4c4192a9f1cfface7195321d
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/14/239414/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 0c8214d..bc3315f 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -26,7 +26,6 @@
 
 7.0.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   antimony.wikimedia.org.
 
-1.6.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   sodium.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   lists.wikimedia.org.
 
 7.1.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   nitrogen.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index f6c1634..fec1ef3 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -51,7 +51,7 @@
 58  1H  IN PTR  vl1001-eth1.lvs1004.wikimedia.org.
 59  1H  IN PTR  vl1001-eth1.lvs1005.wikimedia.org.
 60  1H  IN PTR  vl1001-eth1.lvs1006.wikimedia.org.
-61  1H  IN PTR  sodium.wikimedia.org.
+
 62  1H  IN PTR  plutonium.wikimedia.org.
 
 ; 208.80.154.64/26 (public1-c-eqiad) (.64 - .127)
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 57f2691..1e0c938 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -176,9 +176,6 @@
 silver  1H  IN A208.80.154.136
 1H  IN  2620:0:861:2:208:80:154:136
 californium 1H  IN A208.80.154.147
-sodium  1H  IN A208.80.154.61
-1H  IN  2620:0:861:1:208:80:154:61
-
 tellurium   1H  IN A208.80.155.9
 titanium1H  IN A208.80.154.154
 uranium 1H  IN A208.80.154.53

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90a2c1ca5b17a56c4c4192a9f1cfface7195321d
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] lists: TTL up to 1H - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: lists: TTL up to 1H
..

lists: TTL up to 1H

Change-Id: Ic1a02317f59e7b8a40eadf0af022dae44a216d3c
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/00/239400/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 57f2691..65ee657 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -61,8 +61,8 @@
 dumps   1H  IN CNAME dataset1001
 sitemap 600 IN DYNA  geoip!text-addrs
 
-lists   5M  IN A208.80.154.75
-5M  IN  2620:0:861:3::2
+lists   1H  IN A208.80.154.75
+1H  IN  2620:0:861:3::2
 1H  IN MX   10 lists
 1H  IN TXT  "v=spf1 mx ?all"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1a02317f59e7b8a40eadf0af022dae44a216d3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] Revert "lists: hold mail to lists.wm.o" - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Revert "lists: hold mail to lists.wm.o"
..

Revert "lists: hold mail to lists.wm.o"

This reverts commit 88f5acf5f6af2705e426ef9fcadca342fe534430.

Change-Id: Iff6cea341dfb4de8c9d206eb527b419b0d961e2e
---
M templates/exim/exim4.conf.mailman.erb
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/237161/1

diff --git a/templates/exim/exim4.conf.mailman.erb 
b/templates/exim/exim4.conf.mailman.erb
index e1e61ac..63482ba 100644
--- a/templates/exim/exim4.conf.mailman.erb
+++ b/templates/exim/exim4.conf.mailman.erb
@@ -20,9 +20,6 @@
 domainlist system_domains = @
 domainlist local_domains = +system_domains : +mailman_domains
 
-# Hold all emails, don't send them to mailman
-hold_domains = lists.wikimedia.org
-
 # Standard lists
 domainlist mailman_domains = lists.wikimedia.org
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff6cea341dfb4de8c9d206eb527b419b0d961e2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] phabricator: replace Needs Volunteer with Lowest - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: phabricator: replace Needs Volunteer with Lowest
..

phabricator: replace Needs Volunteer with Lowest

Change-Id: Ic6777da51b3e04922ac47518d0d4605a78c4479f
---
M modules/phabricator/templates/community_metrics.sh.erb
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/235451/1

diff --git a/modules/phabricator/templates/community_metrics.sh.erb 
b/modules/phabricator/templates/community_metrics.sh.erb
index 9094538..b184d0e 100644
--- a/modules/phabricator/templates/community_metrics.sh.erb
+++ b/modules/phabricator/templates/community_metrics.sh.erb
@@ -119,8 +119,8 @@
 END
 )
 
-#echo "rm_volunteer"
-result_mediantasksopen_needsvolunteer=$(MYSQL_PWD=${sql_pass} /usr/bin/mysql 
-h $sql_host -u$sql_user $sql_name << END
+#echo "rm_lowest"
+result_mediantasksopen_lowest=$(MYSQL_PWD=${sql_pass} /usr/bin/mysql -h 
$sql_host -u$sql_user $sql_name << END
 
 SELECT avg(t1.dateCreated) as '' FROM (SELECT @rownum:=@rownum+1 as 
row_number, d.dateCreated FROM maniphest_task d, (SELECT @rownum:=0) r WHERE 
(d.priority = "10" AND d.status = "open") ORDER BY d.dateCreated) as t1, 
(SELECT COUNT(*) AS total_rows FROM maniphest_task d WHERE (d.priority = "10" 
AND d.status = "open")) as t2 WHERE 1 AND t1.row_number IN ( 
floor((total_rows+1)/2), floor((total_rows+2)/2));
 
@@ -170,9 +170,9 @@
 diff_low=$((epochnow-mediantasksopen_low_epoch))
 mediantasksopen_low=$(echo $((diff_low/86400)))
 
-mediantasksopen_needsvolunteer_epoch=$(echo 
$result_mediantasksopen_needsvolunteer | cut -d " " -f3 | sed 's/.//' | sed 
's/.5000//')
-diff_needsvolunteer=$((epochnow-mediantasksopen_needsvolunteer_epoch))
-mediantasksopen_needsvolunteer=$(echo $((diff_needsvolunteer/86400)))
+mediantasksopen_lowest_epoch=$(echo $result_mediantasksopen_lowest | cut -d " 
" -f3 | sed 's/.//' | sed 's/.5000//')
+diff_lowest=$((epochnow-mediantasksopen_lowest_epoch))
+mediantasksopen_lowest=$(echo $((diff_lowest/86400)))
 
 
 lastmonth=$(date --date="last month" +%Y-%m)
@@ -203,7 +203,7 @@
 High: ${mediantasksopen_high}
 Normal: ${mediantasksopen_normal}
 Low: ${mediantasksopen_low}
-Needs Volunteer: ${mediantasksopen_needsvolunteer}
+Lowest: ${mediantasksopen_lowest}
 (How long tasks have been open, not how long they have had that priority)
 
 TODO: Numbers which refer to closed tasks might not be correct, as described 
in T1003.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6777da51b3e04922ac47518d0d4605a78c4479f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: set new settings to improve security - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: set new settings to improve security
..

mailman: set new settings to improve security

Sets new settings introduced at different times between 2.1.14 to 2.1.18 which
improve security of password cookies and automated bounces.

Change-Id: I8a10a2d88b72f9f81566396842cfa27ba151a266
---
M modules/mailman/files/mm_cfg.py
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/235384/1

diff --git a/modules/mailman/files/mm_cfg.py b/modules/mailman/files/mm_cfg.py
index 93c8401..47987da 100644
--- a/modules/mailman/files/mm_cfg.py
+++ b/modules/mailman/files/mm_cfg.py
@@ -126,3 +126,9 @@
 
 # Don't store messages in qfiles/bad
 QRUNNER_SAVE_BAD_MESSAGES = No
+
+# Expire cookies 3600 seconds (1 hour) after last use
+AUTHENTICATION_COOKIE_LIFETIME = 3600
+
+# Don't include full email in automatic bounces
+RESPONSE_INCLUDE_LEVEL = 0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a10a2d88b72f9f81566396842cfa27ba151a266
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] icinga: puppetise apache mods - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: icinga: puppetise apache mods
..

icinga: puppetise apache mods

Bug: T110893
Change-Id: I0f9de9df2d82e81a56e7c65765df5d593841535b
---
M modules/icinga/manifests/web.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/235008/1

diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index b61160c..4556497 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -33,6 +33,9 @@
 }
 
 # install the Icinga Apache site
+include ::apache::mod::rewrite
+include ::apache::mod::authnz_ldap
+
 apache::site { 'icinga.wikimedia.org':
 content => template('icinga/icinga.wikimedia.org.erb'),
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f9de9df2d82e81a56e7c65765df5d593841535b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] admin: add Krenair to researchers - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add Krenair to researchers
..

admin: add Krenair to researchers

Manager approval on ticket. 3 day wait needed.

Bug: T110754
Change-Id: Id06e97bd9ccbc603ad1dea0bbf2ea6bb90de1c5a
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/235047/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index f13a8c8..a5e5082 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -109,7 +109,7 @@
   nuria, ori, otto, springle, tnegrin, yurik, yuvipanda,
   mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal,
   daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, 
niedzielski,
-  neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan]
+  neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan, 
krenair]
   ldap-admins:
 gid: 715
 description: ldap admins

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id06e97bd9ccbc603ad1dea0bbf2ea6bb90de1c5a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] Move host contact_groups to hiera and migrate existing - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Move host contact_groups to hiera and migrate existing
..

Move host contact_groups to hiera and migrate existing

Move the method of overriding the default monitoring contact_group setting of
'admins' from a puppet variable to hiera which allows easier role and host 
specific
contacts.

Change-Id: I7f8a1936564839d8e0faeed2092306a74e65fd67
---
M hieradata/hosts/erbium.yaml
M hieradata/hosts/gadolinium.yaml
M manifests/site.pp
M modules/base/manifests/init.pp
M modules/base/manifests/monitoring/host.pp
5 files changed, 5 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/235065/1

diff --git a/hieradata/hosts/erbium.yaml b/hieradata/hosts/erbium.yaml
index 6a9e7f7..f0a8e99 100644
--- a/hieradata/hosts/erbium.yaml
+++ b/hieradata/hosts/erbium.yaml
@@ -1,3 +1,4 @@
+contactgroups: 'admins,analytics'
 admin::groups:
   - udp2log-users
   - restricted
diff --git a/hieradata/hosts/gadolinium.yaml b/hieradata/hosts/gadolinium.yaml
index fafa457..ee0aea0 100644
--- a/hieradata/hosts/gadolinium.yaml
+++ b/hieradata/hosts/gadolinium.yaml
@@ -1,2 +1,3 @@
+contactgroups: 'admins,analytics'
 admin::groups:
   - udp2log-users
diff --git a/manifests/site.pp b/manifests/site.pp
index 42e9e1a..a155889 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -853,19 +853,6 @@
 
 # erbium is a webrequest udp2log host
 node 'erbium.eqiad.wmnet' {
-
-# include analytics in nagios_contact_group.
-# This is used by class base::monitoring::host for
-# notifications when a host or important service goes down.
-# NOTE:  This cannot be a fully qualified var
-# (i.e. $base::nagios_contact_group) because puppet does not
-# allow setting variables in other namespaces.  I could
-# parameterize class base AND class stanrdard and pass
-# the var down the chain, but that seems like too much
-# modification for just this.  Instead this overrides
-# the default contact_group of 'admins' set in class base.
-$nagios_contact_group = 'admins,analytics'
-
 include standard
 include role::logging
 
@@ -1022,19 +1009,6 @@
 # gadolinium is the webrequest socat multicast relay.
 # base_analytics_logging_node is defined in role/logging.pp
 node 'gadolinium.wikimedia.org' {
-
-# include analytics in nagios_contact_group.
-# This is used by class base::monitoring::host for
-# notifications when a host or important service goes down.
-# NOTE:  This cannot be a fully qualified var
-# (i.e. $base::nagios_contact_group) because puppet does not
-# allow setting variables in other namespaces.  I could
-# parameterize class base AND class stanrdard and pass
-# the var down the chain, but that seems like too much
-# modification for just this.  Instead this overrides
-# the default contact_group of 'admins' set in class base.
-$nagios_contact_group = 'admins,analytics'
-
 include standard
 include role::logging
 
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index b9c4ac9..4899dc9 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -34,13 +34,10 @@
 include base::kernel
 
 # include base::monitor::host.
-# if $nagios_contact_group is set, then use it
+# if contactgroups is set, then use it
 # as the monitor host's contact group.
 
-$group_contact = $::nagios_contact_group ? {
-undef   => 'admins',
-default => $::nagios_contact_group,
-}
+$group_contact = hiera('contactgroups', 'admins')
 
 class { 'base::monitoring::host':
 contact_group => $group_contact,
diff --git a/modules/base/manifests/monitoring/host.pp 
b/modules/base/manifests/monitoring/host.pp
index 6e06e1f..30a9d57 100644
--- a/modules/base/manifests/monitoring/host.pp
+++ b/modules/base/manifests/monitoring/host.pp
@@ -8,7 +8,7 @@
 #
 # Note that this class is probably already included for your node
 # by the class base.  If you want to change the contact_group, set
-# the variable $nagios_contact_group in your node definition.
+# the variable contactgroups in hiera.
 # class base will use this variable as the $contact_group argument
 # when it includes this class.
 #

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f8a1936564839d8e0faeed2092306a74e65fd67
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis 

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

[MediaWiki-commits] [Gerrit] mailman: correct apache 2.4 usage of require not - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: correct apache 2.4 usage of require not
..

mailman: correct apache 2.4 usage of require not

Apache 2.4 requires all granted followed by the require not statement.

Fixes I58fe910e204d6d0d51b85ef1f589f0936a65b0ca

Change-Id: I2c70d87922bcc65f3a7ca0aff53a15a09924eb8a
---
M modules/mailman/templates/lists.wikimedia.org.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/234702/1

diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index 58a74b4..795c6b1 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -20,6 +20,7 @@
 BrowserMatch ArchiveTeam ArchiveBot bad_browser
 Location /
 IfVersion = 2.4
+Require all granted
 Require not env bad_browser
 /IfVersion
 IfVersion  2.4

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c70d87922bcc65f3a7ca0aff53a15a09924eb8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mailman: Don't store bad messages in qfiles - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: Don't store bad messages in qfiles
..

mailman: Don't store bad messages in qfiles

In version 2.1.12, a feature was added which stores unparseable messages in
a bad directory if it couldn't be actioned. With the scale of messages sent to
lists.wikimedia.org, this causes a fairly large directory to be created which
we or mailman never uses. Since most messages are a result of client-related
encoding issues (sampled on fermium), let's not store these at all.

Change-Id: If1d5fdec1632d87f86786acc506227fad655bb94
---
M modules/mailman/files/mm_cfg.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/234043/1

diff --git a/modules/mailman/files/mm_cfg.py b/modules/mailman/files/mm_cfg.py
index 52fc11b..93c8401 100644
--- a/modules/mailman/files/mm_cfg.py
+++ b/modules/mailman/files/mm_cfg.py
@@ -123,3 +123,6 @@
 
 # use https for mailman archive links instead of the default http
 PUBLIC_ARCHIVE_URL = 'https://%(hostname)s/pipermail/%(listname)s/'
+
+# Don't store messages in qfiles/bad
+QRUNNER_SAVE_BAD_MESSAGES = No

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1d5fdec1632d87f86786acc506227fad655bb94
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] lists: hold mail to lists.wm.o - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: lists: hold mail to lists.wm.o
..

lists: hold mail to lists.wm.o

Do not send emails to mailman to be handled or bounce. Hold them in a queue
as they are so sodium and fermium can work at the same time during a migration
with no mail being lost because of DNS updates or migration steps.

Bug: T110136
Change-Id: Ic38a9129a27a979b6e505cf4b556b36f5b0c4133
---
M templates/exim/exim4.conf.mailman.erb
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/233750/1

diff --git a/templates/exim/exim4.conf.mailman.erb 
b/templates/exim/exim4.conf.mailman.erb
index 63482ba..e1e61ac 100644
--- a/templates/exim/exim4.conf.mailman.erb
+++ b/templates/exim/exim4.conf.mailman.erb
@@ -20,6 +20,9 @@
 domainlist system_domains = @
 domainlist local_domains = +system_domains : +mailman_domains
 
+# Hold all emails, don't send them to mailman
+hold_domains = lists.wikimedia.org
+
 # Standard lists
 domainlist mailman_domains = lists.wikimedia.org
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic38a9129a27a979b6e505cf4b556b36f5b0c4133
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] lists: lower A[AAA] records to 5M - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: lists: lower A[AAA] records to 5M
..

lists: lower A[AAA] records to 5M

Necessary for a quick revert of IPs for the mailman migration when it happens.
Can be lowered even lower to 1M or 30S if necessary but this should fulfil.

Change-Id: I1b2b074d3ec8963732a3c78c602ddd33d90b218c
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/49/233049/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 9b0feec..316609e 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -61,8 +61,8 @@
 dumps   1H  IN CNAME dataset1001
 sitemap 1H  IN CNAME dumps
 
-lists   1H  IN A208.80.154.4
-1H  IN  2620:0:861:1::2
+lists   5M  IN A208.80.154.4
+5M  IN  2620:0:861:1::2
 1H  IN MX   10 lists
 1H  IN TXT  v=spf1 mx ?all
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b2b074d3ec8963732a3c78c602ddd33d90b218c
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] lists: add service IPs for lists on fermium - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: lists: add service IPs for lists on fermium
..

lists: add service IPs for lists on fermium

Adds PTRs for lists.wikimedia.org for usage as service IPs during the mailman
migration.

Change-Id: Ida76f23220931a4575baf8786acf5aa82237b17d
A: 208.80.154.74
: 2620:0:861:3::2
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/50/233050/1

diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 101cf52..2fd0e05 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -63,7 +63,7 @@
 ; public1-c-eqiad (2620:0:861:3::/64)
 $ORIGIN 3.0.0.0.{{ zonename }}.
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   vrrp-gw-1003.wikimedia.org.
-
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   lists.wikimedia.org. ; service IP 
for lists on fermium
 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae3-1003.cr1-eqiad.wikimedia.org.
 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR   ae3-1003.cr2-eqiad.wikimedia.org.
 9.8.0.0.4.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR   lead.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa 
b/templates/154.80.208.in-addr.arpa
index 156324f..58e1f00 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -59,6 +59,7 @@
 71  1H  IN PTR  vl1003-eth2.lvs1005.wikimedia.org.
 72  1H  IN PTR  vl1003-eth2.lvs1006.wikimedia.org.
 73  1H  IN PTR  gadolinium.wikimedia.org.
+74  1H  IN PTR  lists.wikimedia.org. ; Service IP for lists on fermium
 78  1H  IN PTR  vl1003-eth2.lvs1001.wikimedia.org.
 79  1H  IN PTR  hafnium.wikimedia.org.
 80  1H  IN PTR  ytterbium.wikimedia.org.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida76f23220931a4575baf8786acf5aa82237b17d
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] fermium: add service IPs to hiera - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: fermium: add service IPs to hiera
..

fermium: add service IPs to hiera

Change-Id: I24d0945b3033909ed724567ccf412a8c197244f5
---
M hieradata/hosts/fermium.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/233052/1

diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml
index f39d3b2..9194421 100644
--- a/hieradata/hosts/fermium.yaml
+++ b/hieradata/hosts/fermium.yaml
@@ -1,2 +1,8 @@
 admin::groups:
   - mailman-admins
+mailman::lists_ip:
+  - '208.80.154.74'
+  - '2620:0:861:3::2'
+mailman::server_ip:
+  - '127.0.0.1'
+  - '::1'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24d0945b3033909ed724567ccf412a8c197244f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add disable/enable list script to mailman::scripts - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add disable/enable list script to mailman::scripts
..

add disable/enable list script to mailman::scripts

To make things simplier and more uniform, add a script that can be ran to
disable and enable mailman lists through configuration variables only.

Change-Id: I354475e0c2071c9d18ce7c8d2e039898b36ce86c
---
A modules/mailman/files/scripts/disable_list.sh
M modules/mailman/manifests/scripts.pp
2 files changed, 60 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/232494/1

diff --git a/modules/mailman/files/scripts/disable_list.sh 
b/modules/mailman/files/scripts/disable_list.sh
new file mode 100644
index 000..8dbf14a
--- /dev/null
+++ b/modules/mailman/files/scripts/disable_list.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+# Enables and Disables a Mailman mailing list simply thorugh configuration 
settings.
+#
+# John Lewis 2015
+
+ENABLE=0
+
+function disable_list {
+echo advertised=0 | config_list -i /dev/stdin $list
+echo emergency=1  | config_list -i /dev/stdin $list
+echo member_moderation_action=2 | config_list -i /dev/stdin $list
+echo generic_nonmember_action=2 | config_list -i /dev/stdin $list
+rm /var/lib/mailman/data/heldmsg-$list-*.pck
+}
+
+function enable_list {
+echo advertised=1 | config_list -i /dev/stdin $list
+echo emergency=0  | config_list -i /dev/stdin $list
+echo member_moderation_action=0 | config_list -i /dev/stdin $list
+echo generic_nonmember_action=1 | config_list -i /dev/stdin $list
+}
+
+function usage {
+echo Usage: $0 [-e|--enable] listname; exit 1;
+}
+
+while test $# -gt 0; do
+case $1 in
+--help|-h)
+usage
+exit 0
+;;
+--enable|-e)
+ENABLE=1
+shift
+;;
+*)
+list=$1
+shift
+;;
+
+esac
+done
+
+if [ $ENABLE -eq 1 ]; then
+enable_list
+echo $list enabled. Please verify archives are intact and the list 
administrative page works.
+else
+disable_list
+echo $list disabled. Archives should be available at current location, 
all mail should be moderated and the list should not be on the listinfo page.
+fi
diff --git a/modules/mailman/manifests/scripts.pp 
b/modules/mailman/manifests/scripts.pp
index 4612112..2b2f8d7 100644
--- a/modules/mailman/manifests/scripts.pp
+++ b/modules/mailman/manifests/scripts.pp
@@ -24,4 +24,12 @@
 mode   = '0540',
 source = 'puppet:///modules/mailman/scripts/import_all_lists.sh'
 }
+
+file { '/var/lib/mailman/bin/disable_list.sh':
+ensure = 'present',
+owner  = 'root',
+group  = 'list',
+mode   = '0540',
+source = 'puppet:///modules/mailman/scripts/disable_list.sh'
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I354475e0c2071c9d18ce7c8d2e039898b36ce86c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add missing ssl key for mailman - change (labs/private)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add missing ssl key for mailman
..

add missing ssl key for mailman

Thought I added this earlier for getting mailman-puppet/mailman-jessie working
but no. Apparently I didn't.

Change-Id: I93fa9d729b5a741a699331931abb9254c02ba7ba
---
A modules/secret/secrets/ssl/lists.wikimedia.org.key
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/74/232474/1

diff --git a/modules/secret/secrets/ssl/lists.wikimedia.org.key 
b/modules/secret/secrets/ssl/lists.wikimedia.org.key
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/modules/secret/secrets/ssl/lists.wikimedia.org.key
@@ -0,0 +1 @@
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93fa9d729b5a741a699331931abb9254c02ba7ba
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mailman: don't notify emails being removed by script - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: don't notify emails being removed by script
..

mailman: don't notify emails being removed by script

Adds a -n param which means we don't have mailman email either a defunct email
generating bounces or forwarding needlessly to personal emails causing 
confusion.

Change-Id: Ia1034ce64cc396dab6fb58240b0909c7a4c31346
---
M modules/mailman/files/scripts/remove_from_private.sh
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/232502/1

diff --git a/modules/mailman/files/scripts/remove_from_private.sh 
b/modules/mailman/files/scripts/remove_from_private.sh
index 01cafcd..a130e9f 100644
--- a/modules/mailman/files/scripts/remove_from_private.sh
+++ b/modules/mailman/files/scripts/remove_from_private.sh
@@ -112,8 +112,8 @@
 for privlist in ${privatelists[@]}
 do
 # echo $privlist
-echo ${mm_base}remove_members -f /tmp/remove-mailman-user $privlist
-${mm_base}remove_members -f /tmp/remove-mailman-user $privlist
+echo ${mm_base}remove_members -n -f /tmp/remove-mailman-user $privlist
+${mm_base}remove_members -n -f /tmp/remove-mailman-user $privlist
 done
 
 rm /tmp/remove-mailman-user

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1034ce64cc396dab6fb58240b0909c7a4c31346
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mailman: give g+x on scripts - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: give g+x on scripts
..

mailman: give g+x on scripts

Allow the 'list' user/group to execute these scripts as well.

Change-Id: I165c6966721362ad398f89b403a520001b6dc884
---
M modules/mailman/manifests/scripts.pp
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/mailman/manifests/scripts.pp 
b/modules/mailman/manifests/scripts.pp
index 4612112..f5826ce 100644
--- a/modules/mailman/manifests/scripts.pp
+++ b/modules/mailman/manifests/scripts.pp
@@ -5,7 +5,7 @@
 ensure = 'present',
 owner  = 'root',
 group  = 'list',
-mode   = '0540',
+mode   = '0550',
 source = 'puppet:///modules/mailman/scripts/remove_from_private.sh'
 }
 
@@ -13,7 +13,7 @@
 ensure = 'present',
 owner  = 'root',
 group  = 'list',
-mode   = '0540',
+mode   = '0550',
 source = 'puppet:///modules/mailman/scripts/import_list.sh'
 }
 
@@ -21,7 +21,7 @@
 ensure = 'present',
 owner  = 'root',
 group  = 'list',
-mode   = '0540',
+mode   = '0550',
 source = 'puppet:///modules/mailman/scripts/import_all_lists.sh'
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I165c6966721362ad398f89b403a520001b6dc884
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add dummy values for mailman in labs private - change (labs/private)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add dummy values for mailman in labs private
..

add dummy values for mailman in labs private

Change-Id: I4cea4f06f7efe3a6ef6f5e9ea3fee88b4895f49d
---
A modules/secret/secrets/dkim/lists.wikimedia.org-wikimedia.key
A modules/secret/secrets/dkim/wikimedia.org-wikimedia.key
A modules/secret/secrets/mailman/arbcom-l.htdigest
3 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/72/232472/1

diff --git a/modules/secret/secrets/dkim/lists.wikimedia.org-wikimedia.key 
b/modules/secret/secrets/dkim/lists.wikimedia.org-wikimedia.key
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/modules/secret/secrets/dkim/lists.wikimedia.org-wikimedia.key
@@ -0,0 +1 @@
+
diff --git a/modules/secret/secrets/dkim/wikimedia.org-wikimedia.key 
b/modules/secret/secrets/dkim/wikimedia.org-wikimedia.key
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/modules/secret/secrets/dkim/wikimedia.org-wikimedia.key
@@ -0,0 +1 @@
+
diff --git a/modules/secret/secrets/mailman/arbcom-l.htdigest 
b/modules/secret/secrets/mailman/arbcom-l.htdigest
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/modules/secret/secrets/mailman/arbcom-l.htdigest
@@ -0,0 +1 @@
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cea4f06f7efe3a6ef6f5e9ea3fee88b4895f49d
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mailman: move exim outbound ip config to hiera - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: move exim outbound ip config to hiera
..

mailman: move exim outbound ip config to hiera

Moves the existing hiera config for interface::ip to an array and get the IPs
from the array through a $lists_ip variable. Then adds an array for the host IPs
to be added in a different array (for outbound config).

Move exim4 to use the hiera_array function to get the hiera values allowing it
to join them into the exim4 configuration file.

Tested in labs on mailman-jessie.mailman.eqiad.wmflabs.

Change-Id: Ida732be43f479a2ddf97dfc97da40db2bcf99ace
---
M hieradata/role/common/lists.yaml
M manifests/role/lists.pp
2 files changed, 12 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/232080/1

diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml
index ebca662..88abc5c 100644
--- a/hieradata/role/common/lists.yaml
+++ b/hieradata/role/common/lists.yaml
@@ -1,5 +1,8 @@
 standard::has_default_mail_relay: false
-mailman::lists_ipv4: '208.80.154.4'
-mailman::lists_ipv6: '2620:0:861:1::2'
 mailman::lists_servername: 'lists.wikimedia.org'
-
+mailman::lists_ip:
+  - '208.80.154.4'
+  - '2620:0:861:1::2'
+mailman::server_ip:
+  - '208.80.154.61'
+  - '2620:0:861:1:208:80:154:61'
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
index 80dac7f..1bff0cd 100644
--- a/manifests/role/lists.pp
+++ b/manifests/role/lists.pp
@@ -9,26 +9,22 @@
 recipient = 'r...@wikimedia.org',
 }
 
+$lists_ip = hiera('mailman::lists_ip')
+
 interface::ip { 'lists.wikimedia.org_v4':
 interface = 'eth0',
-address   = hiera('mailman::lists_ipv4'),
+address   = $lists_ip[0],
 prefixlen = '32',
 }
 
 interface::ip { 'lists.wikimedia.org_v6':
 interface = 'eth0',
-address   = hiera('mailman::lists_ipv6'),
+address   = $lists_ip[1],
 prefixlen = '128',
 }
 
-$outbound_ips = [
-'208.80.154.61',
-'2620:0:861:1:208:80:154:61'
-]
-$list_outbound_ips = [
-'208.80.154.4',
-'2620:0:861:1::2'
-]
+$outbound_ips = hiera_array('mailman::server_ip')
+$list_outbound_ips = hiera_array('mailman::lists_ip')
 
 sslcert::certificate { 'lists.wikimedia.org': }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida732be43f479a2ddf97dfc97da40db2bcf99ace
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] cname debian.wikimedia.org to carbon (apt) - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: cname debian.wikimedia.org to carbon (apt)
..

cname debian.wikimedia.org to carbon (apt)

Puppet: I59936679ab3a1007c48bbfffb26cfe16e38f894f

Change-Id: I934515a64d4f19d42fe83f50be7ad8b6173028be
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/82/231882/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index fbd8b86..4958c1b 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -610,6 +610,7 @@
 cs   600 IN DYNA geoip!text-addrs
 cz   600 IN DYNA geoip!text-addrs
 datasets 1H  IN CNAMEmisc-web-lb.eqiad
+debian   1H  IN CNAMEcarbon
 download 1H  IN CNAMEdumps
 etherpad 5M  IN CNAMEmisc-web-lb.eqiad
 fundraising  1H  IN CNAMEfundraising-eqiad

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I934515a64d4f19d42fe83f50be7ad8b6173028be
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mirrors: add debian.wikimedia.org as a servername - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mirrors: add debian.wikimedia.org as a servername
..

mirrors: add debian.wikimedia.org as a servername

DNS: I934515a64d4f19d42fe83f50be7ad8b6173028be

Change-Id: I59936679ab3a1007c48bbfffb26cfe16e38f894f
---
M modules/mirrors/files/nginx.conf
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/mirrors/files/nginx.conf b/modules/mirrors/files/nginx.conf
index f7f6989..bbcdd49 100644
--- a/modules/mirrors/files/nginx.conf
+++ b/modules/mirrors/files/nginx.conf
@@ -1,7 +1,7 @@
 server {
listen 80;
listen [::]:80;
-   server_name mirrors.wikimedia.org ubuntu.wikimedia.org;
+   server_name mirrors.wikimedia.org ubuntu.wikimedia.org debian.wikimedia.org;
root /srv/mirrors;
 
location / {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59936679ab3a1007c48bbfffb26cfe16e38f894f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] fermium: add mapped ipv6 - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: fermium: add mapped ipv6
..

fermium: add mapped ipv6

Change-Id: I3c70b752ef69dfd6fc55aa790277ba639905c4cf
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/230239/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 9181bb8..a7f76a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -969,6 +969,11 @@
 include admin
 include base::firewall
 include role::lists::migration
+
+interface::add_ip6_mapped { 'main':
+interface = 'eth0',
+}
+
 }
 
 node 'fluorine.eqiad.wmnet' {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c70b752ef69dfd6fc55aa790277ba639905c4cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] fermium: override role default IPs - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: fermium: override role default IPs
..

fermium: override role default IPs

Add placeholders of 127.0.0.1 and ::1 for the service IPs. This exists now just
to provide an easy patch to modify for when fermium gets service IPs for new
mailman lists service.

Change-Id: I37abd8e17f5b81b10cb520f26fcc0e85de4b93bd
---
M hieradata/hosts/fermium.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/230240/1

diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml
index aa787e4..1d0bb9e 100644
--- a/hieradata/hosts/fermium.yaml
+++ b/hieradata/hosts/fermium.yaml
@@ -1,2 +1,4 @@
 admin::groups:
   - mailman-users
+mailman::lists_ipv4: '127.0.0.1'
+mailman::lists_ipv6: '::1'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37abd8e17f5b81b10cb520f26fcc0e85de4b93bd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] admin: add mailman-admins group - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add mailman-admins group
..

admin: add mailman-admins group

Allows doing everything as lists (viewing logs, running shell scripts, viewing
other list things like config, mboxes), managing the mailman service and viewing
service logs and syslogs via journalctl.

Change-Id: I1f6a7016d49dee53da8ca3e013effb5b3244be3f
---
M modules/admin/data/data.yaml
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/230133/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index d7397ad..6ae7950 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -344,6 +344,13 @@
 gid: 756
 description: non-root login on mailman staging server
 members: [johnflewis]
+  mailman-admins:
+gid: 757
+description: Admins for mailman
+members: []
+privileges: ['ALL = (list) NOPASSWD: ALL',
+ 'ALL = NOPASSWD: /usr/sbin/service mailman *',
+ 'ALL = NOPASSWD: /bin/journalctl *']
 
 users:
   rush:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f6a7016d49dee53da8ca3e013effb5b3244be3f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] admin: add johnflewis to mailman-admins - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add johnflewis to mailman-admins
..

admin: add johnflewis to mailman-admins

Bug: T108082
Change-Id: I2a721c2fbc7883820f6cd6367f235e7cc4a938ac
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/230134/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 6ae7950..534a963 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -347,7 +347,7 @@
   mailman-admins:
 gid: 757
 description: Admins for mailman
-members: []
+members: [johnflewis]
 privileges: ['ALL = (list) NOPASSWD: ALL',
  'ALL = NOPASSWD: /usr/sbin/service mailman *',
  'ALL = NOPASSWD: /bin/journalctl *']

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a721c2fbc7883820f6cd6367f235e7cc4a938ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mailman: add apache and exim aliases for education-coop rename - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: add apache and exim aliases for education-coop rename
..

mailman: add apache and exim aliases for education-coop rename

Bug: T107445
Change-Id: I6f9f1f072a5111d48925d62bc473f7af84a26f93
---
M files/exim/listserver_aliases
M modules/mailman/templates/lists.wikimedia.org.erb
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/229978/1

diff --git a/files/exim/listserver_aliases b/files/exim/listserver_aliases
index 41c4ee6..f74e0fc 100644
--- a/files/exim/listserver_aliases
+++ b/files/exim/listserver_aliases
@@ -13,3 +13,4 @@
 pywikipedia-l:pywikibot
 pywikipedia-announce: pywikibot-announce
 pywikipedia-bugs: pywikibot-bugs
+education-coop:   education-collab
diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index 12e1dfd..633cc16 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -80,6 +80,7 @@
 Redirect permanent /mailman/listinfo/pywikipedia-lhttps://%= 
@lists_servername %/mailman/listinfo/pywikibot
 Redirect permanent /mailman/listinfo/pywikipedia-announce https://%= 
@lists_servername %/mailman/listinfo/pywikibot-announce
 Redirect permanent /mailman/listinfo/pywikipedia-bugs https://%= 
@lists_servername %/mailman/listinfo/pywikibot-bugs
+Redirect permanent /mailman/listinfo/education-coop   https://%= 
@lists_servername %/mailman/listinfo/education-collab
 
 ErrorLog /var/log/apache2/%= @lists_servername %-error.log
 CustomLog /var/log/apache2/%= @lists_servername %-access.log combined

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f9f1f072a5111d48925d62bc473f7af84a26f93
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add wmf-officeit group to metawiki - change (operations/mediawiki-config)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add wmf-officeit group to metawiki
..

add wmf-officeit group to metawiki

Per request by James Alexander on IRC, adding a group for wmf-officeit
with createaccount, centralauth-lock, noratelimit and tboverride.

Rights added were specifically requested.

Bug: T106724
Change-Id: I824bd2136c88d57f69b9c8d08e9304dc89088703
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/79/227879/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ea5323e..1669f84 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7743,6 +7743,12 @@
'reupload' = true,
'reupload-own' = true,
),
+   'wmf-officeit' = array( // T106724
+   'centralauth-lock' = true,
+   'createaccount' = true,
+   'noratelimit' = true,
+   'tboverride' = true,
+   ),
),
'mkwiki' = array(
'autopatrolled' = array( 'autopatrol' = true ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I824bd2136c88d57f69b9c8d08e9304dc89088703
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add event{donations} CNAMEs for Major Gift - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add event{donations} CNAMEs for Major Gift
..

add event{donations} CNAMEs for Major Gift

Bug: T107060
Change-Id: I7f9253b282efdd1e4432446a0085ca35ce03d003
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/05/227705/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 73fef8a..38d10c7 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -416,7 +416,8 @@
 dev 600 IN DYNA geoip!text-addrs
 doc 1H  IN CNAMEmisc-web-lb.eqiad
 docs600 IN DYNA geoip!text-addrs
-
+events  1H  IN CNAMEtrilogytools1.azurewebsites.net
+eventdonations  1H  IN CNAME
contrib-wi-10109-10472-20140728-1682402186.us-east-1.elb.amazonaws.com
 ldap-mirror 1H  IN CNAMEplutonium.wikimedia.org.
 
 labs-puppetmaster-eqiad 300 IN CNAME  labcontrol1001.wikimedia.org.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f9253b282efdd1e4432446a0085ca35ce03d003
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] admin: add new ssh key for joal - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: admin: add new ssh key for joal
..

admin: add new ssh key for joal

Bug: T106812
Change-Id: I4f9150f89b702440e728e99b13a5842919d00358
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/226710/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 07a985a..63e2c09 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1352,7 +1352,7 @@
 gid: 500
 name: joal
 realname: Joseph Allemandou
-ssh_keys: []
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCpc0uajJje5PSoka43J7el6BDoyiLsKjofgXCJHKs4lOJN7MCRM6uYYwnT2R8e1KyRCdotkTXWBgH8CYhYaqp9Pt3QBg/Rx7BurkHxk+4xe0n3N2rtllYxPkar0xjpt8HUVa24V+MwJhbvpvJtHvtqklBEVWl1t64K9ZHn2ZKNJdD/aGIZGvJcZfzGx3JOIQqlzdoiZf/FcC2za1cUt9a/NQs8hJvpNLdfqxz6Hw4ZYMIrLeTanIKAEoGxmMEiKXul1qX4qj3BCjVREZCdYWM1d7rA763UXTsnr0b0DLHZQs5pQX2afKtZ5HAdffZx2XzTs7fSzRApkUpg4Z3CNjynZamusR79hjKaDfl1wBxtlsVBGY72c0VVaJ4pqEQK/RtFvgRhBKz5TLbbYwF4g1eEQ1R8VF5loJgXe0erhasLn5Y440jBKLSGI3wdEpzMtGm52HTm9alASgHFTR2AIWDFk+7lj0GklgklC4W3PdJlD0Wdz2m2RmTWzJbIFJDlfSYYKuEcz2w5GYUdc9y6B0atSPG1iuqclmQrXEpvjyK1ckQxEjHWzCtvz+DqJC6mnwapxoFk+Z4Me92xJuGxzvC2M1O/MrVEsPot9cNpJvKsX6CG4dX7numBjvpS6aOhsIfsyOBId0v8REySd80+ndFS9TODG1YYoZAvfb8xnQTPyQ==
 j...@wikimedia.org]
 uid: 11654
   daisy:
 ensure: present

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f9150f89b702440e728e99b13a5842919d00358
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] labs: set project mount to true on wikistats - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: labs: set project mount to true on wikistats
..

labs: set project mount to true on wikistats

Needed for labsdeprepo across instances on /data/project.

Change-Id: I05ed4cfe7cb4222f3aad8d198a79b1b11bb3dfda
---
M modules/labstore/files/nfs-mounts.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/224739/1

diff --git a/modules/labstore/files/nfs-mounts.yaml 
b/modules/labstore/files/nfs-mounts.yaml
index 3882263..07bb86d 100644
--- a/modules/labstore/files/nfs-mounts.yaml
+++ b/modules/labstore/files/nfs-mounts.yaml
@@ -243,6 +243,10 @@
   home: true
   project: true
   scratch: true
+  wikistats:
+gid: 50338
+mounts:
+   project: true
   wikiviajesve:
 gid: 52059
 mounts:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05ed4cfe7cb4222f3aad8d198a79b1b11bb3dfda
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] remove db100[2-7] from install_server and coredb - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: remove db100[2-7] from install_server and coredb
..

remove db100[2-7] from install_server and coredb

old servers which no longer should be in production. Don't exist in site.pp
and have no use anymore.

Change-Id: Ia146891f7c2946ebc4d846567171915a1b831d3e
---
M manifests/role/coredb.pp
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 13 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/224558/1

diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 74787b8..ce757a0 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -15,46 +15,46 @@
 'no_master'= [ 'db1050', 'db1055' ]
 },
 's2' = {
-'hosts' = { 'eqiad' = [ 'db1002', 'db1009', 'db1018', 'db1024', 
'db1036', 'db1060', 'db1063', 'db1067' ] },
+'hosts' = { 'eqiad' = [ 'db1009', 'db1018', 'db1024', 'db1036', 
'db1060', 'db1063', 'db1067' ] },
 'primary_site' = $::mw_primary,
 'masters'  = { 'eqiad' = 'db1024' },
 'snapshot' = [ 'db1018' ],
-'no_master'= [ 'db1002', 'db1018' ]
+'no_master'= [ 'db1018' ]
 },
 's3' = {
-'hosts' = { 'eqiad' = [ 'db1003', 'db1019', 'db1027', 'db1035', 
'db1038' ] },
+'hosts' = { 'eqiad' = [ 'db1019', 'db1027', 'db1035', 'db1038' ] 
},
 'primary_site' = $::mw_primary,
 'masters'  = { 'eqiad' = 'db1038' },
 'snapshot' = [ 'db1035' ],
-'no_master'= [ 'db1003', 'db1035' ]
+'no_master'= [ 'db1035' ]
 },
 's4' = {
-'hosts' = { 'eqiad' = [ 'db1004', 'db1040', 'db1042', 'db1056', 
'db1059', 'db1064', 'db1068' ] },
+'hosts' = { 'eqiad' = [ 'db1040', 'db1042', 'db1056', 'db1059', 
'db1064', 'db1068' ] },
 'primary_site' = $::mw_primary,
 'masters'  = { 'eqiad' = 'db1040' },
 'snapshot' = [ 'db1042' ],
-'no_master'= [ 'db1004', 'db1042' ]
+'no_master'= [ 'db1042' ]
 },
 's5' = {
-'hosts' = { 'eqiad' = [ 'db1005', 'db1021', 'db1026', 'db1037', 
'db1045', 'db1049', 'db1058' ] },
+'hosts' = { 'eqiad' = [ 'db1021', 'db1026', 'db1037', 'db1045', 
'db1049', 'db1058' ] },
 'primary_site' = $::mw_primary,
 'masters'  = { 'eqiad' = 'db1058' },
-'snapshot' = [ 'db1005' ],
-'no_master'= [ 'db1005', 'db1026' ]
+'snapshot' = [ ],
+'no_master'= [ 'db1026' ]
 },
 's6' = {
-'hosts' = { 'eqiad' = [ 'db1006', 'db1010', 'db1015', 'db1022', 
'db1023', 'db1030' ] },
+'hosts' = { 'eqiad' = [ 'db1010', 'db1015', 'db1022', 'db1023', 
'db1030' ] },
 'primary_site' = $::mw_primary,
 'masters'  = { 'eqiad' = 'db1023' },
 'snapshot' = [ 'db1022' ],
 'no_master'= [ 'db1022', 'db1010' ]
 },
 's7' = {
-'hosts' = { 'eqiad' = [ 'db1007', 'db1028', 'db1033', 'db1034', 
'db1039', 'db1041' ] },
+'hosts' = { 'eqiad' = [ 'db1028', 'db1033', 'db1034', 'db1039', 
'db1041' ] },
 'primary_site' = $::mw_primary,
 'masters'  = { 'eqiad' = 'db1033' },
-'snapshot' = [ 'db1007' ],
-'no_master'= [ 'db1007', 'db1041' ]
+'snapshot' = [ ],
+'no_master'= [ 'db1041' ]
 },
 'x1' = {
 'hosts' = {
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 15cdaf9..785f406 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1140,36 +1140,6 @@
fixed-address db1001.eqiad.wmnet;
 }
 
-host db1002 {
-   hardware ethernet 78:2b:cb:03:63:4b;
-   fixed-address db1002.eqiad.wmnet;
-}
-
-host db1003 {
-   hardware ethernet 78:2b:cb:05:02:e3;
-   fixed-address db1003.eqiad.wmnet;
-}
-
-host db1004 {
-   hardware ethernet 78:2b:cb:03:cc:bc;
-   fixed-address db1004.eqiad.wmnet;
-}
-
-host db1005 {
-   hardware ethernet 78:2b:cb:03:60:f9;
-   fixed-address db1005.eqiad.wmnet;
-}
-
-host db1006 {
-   hardware ethernet 78:2b:cb:03:64:8f;
-   fixed-address db1006.eqiad.wmnet;
-}
-
-host db1007 {
-   hardware ethernet 78:2b:cb:04:da:0b;
-   fixed-address db1007.eqiad.wmnet;
-}
-
 host db1009 {
hardware ethernet 78:2b:cb:0a:04:1b;
fixed-address db1009.eqiad.wmnet;

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] remove db100[2-7]{.mgmt}.eqiad.wmnet - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: remove db100[2-7]{.mgmt}.eqiad.wmnet
..

remove db100[2-7]{.mgmt}.eqiad.wmnet

old servers that can are going to be decommissioned. No longer in use. Keep
WMF* mgmt tags.

Change-Id: I94b0298e01442a92cf54cca90718ad798c59ed55
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/60/224560/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 5f975f0..84397c3 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -227,12 +227,7 @@
 3   1H IN PTR   ae1-1017.cr2-eqiad.wikimedia.org.
 4   1H IN PTR   cam1-a-b-eqiad.eqiad.wmnet.
 5   1H IN PTR   db1001.eqiad.wmnet.
-6   1H IN PTR   db1002.eqiad.wmnet.
-7   1H IN PTR   db1003.eqiad.wmnet.
-8   1H IN PTR   db1004.eqiad.wmnet.
-9   1H IN PTR   db1005.eqiad.wmnet.
-10  1H IN PTR   db1006.eqiad.wmnet.
-11  1H IN PTR   db1007.eqiad.wmnet.
+
 13  1H IN PTR   db1009.eqiad.wmnet.
 14  1H IN PTR   db1010.eqiad.wmnet.
 15  1H IN PTR   db1011.eqiad.wmnet.
@@ -2108,17 +2103,11 @@
 
 1   1H IN PTR   db1001.mgmt.eqiad.wmnet.
 1   1H IN PTR   wmf3090.mgmt.eqiad.wmnet.
-2   1H IN PTR   db1002.mgmt.eqiad.wmnet.
 2   1H IN PTR   wmf3089.mgmt.eqiad.wmnet.
-3   1H IN PTR   db1003.mgmt.eqiad.wmnet.
 3   1H IN PTR   wmf3088.mgmt.eqiad.wmnet.
-4   1H IN PTR   db1004.mgmt.eqiad.wmnet.
 4   1H IN PTR   wmf3087.mgmt.eqiad.wmnet.
-5   1H IN PTR   db1005.mgmt.eqiad.wmnet.
 5   1H IN PTR   wmf3086.mgmt.eqiad.wmnet.
-6   1H IN PTR   db1006.mgmt.eqiad.wmnet.
 6   1H IN PTR   wmf3085.mgmt.eqiad.wmnet.
-7   1H IN PTR   db1007.mgmt.eqiad.wmnet.
 7   1H IN PTR   wmf3084.mgmt.eqiad.wmnet.
 8   1H IN PTR   db1008.mgmt.eqiad.wmnet.
 8   1H IN PTR   wmf3083.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index ea53b29..ce28dc0 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -217,12 +217,6 @@
 curium  1H  IN A10.64.0.170
 1H  IN  2620:0:861:101:10:64:0:170
 db1001  1H  IN A10.64.0.5
-db1002  1H  IN A10.64.0.6
-db1003  1H  IN A10.64.0.7
-db1004  1H  IN A10.64.0.8
-db1005  1H  IN A10.64.0.9
-db1006  1H  IN A10.64.0.10
-db1007  1H  IN A10.64.0.11
 db1009  1H  IN A10.64.0.13
 db1010  1H  IN A10.64.0.14
 db1011  1H  IN A10.64.0.15
@@ -1036,17 +1030,11 @@
 WMF3471 1H  IN A10.65.3.85
 db1001  1H  IN A10.65.6.1
 WMF3090 1H  IN A10.65.6.1
-db1002  1H  IN A10.65.6.2
 WMF3089 1H  IN A10.65.6.2
-db1003  1H  IN A10.65.6.3
 WMF3088 1H  IN A10.65.6.3
-db1004  1H  IN A10.65.6.4
 WMF3087 1H  IN A10.65.6.4
-db1005  1H  IN A10.65.6.5
 WMF3086 1H  IN A10.65.6.5
-db1006  1H  IN A10.65.6.6
 WMF3085 1H  IN A10.65.6.6
-db1007  1H  IN A10.65.6.7
 WMF3084 1H  IN A10.65.6.7
 db1008  1H  IN A10.65.6.8
 WMF3083 1H  IN A10.65.6.8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94b0298e01442a92cf54cca90718ad798c59ed55
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mail: fix location of mailman hiera settings - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mail: fix location of mailman hiera settings
..

mail: fix location of mailman hiera settings

Change-Id: I899eee6571e57434347ec4763f85e20be313aa81
---
M hieradata/role/common/mail/lists.yaml
D hieradata/role/common/mailman.yaml
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/224531/1

diff --git a/hieradata/role/common/mail/lists.yaml 
b/hieradata/role/common/mail/lists.yaml
index 7ad0377..ebca662 100644
--- a/hieradata/role/common/mail/lists.yaml
+++ b/hieradata/role/common/mail/lists.yaml
@@ -1 +1,5 @@
 standard::has_default_mail_relay: false
+mailman::lists_ipv4: '208.80.154.4'
+mailman::lists_ipv6: '2620:0:861:1::2'
+mailman::lists_servername: 'lists.wikimedia.org'
+
diff --git a/hieradata/role/common/mailman.yaml 
b/hieradata/role/common/mailman.yaml
deleted file mode 100644
index 023c4e5..000
--- a/hieradata/role/common/mailman.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-mailman::lists_ipv4: '208.80.154.4'
-mailman::lists_ipv6: '2620:0:861:1::2'
-mailman::lists_servername: 'lists.wikimedia.org'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I899eee6571e57434347ec4763f85e20be313aa81
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add dummy lists.wm.o key - change (labs/private)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add dummy lists.wm.o key
..

add dummy lists.wm.o key

Change-Id: Ic02d7894cb2418aaeab809928ae009a7a137aa58
---
A files/ssl/lists.wikimedia.org.key
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/08/224208/1

diff --git a/files/ssl/lists.wikimedia.org.key 
b/files/ssl/lists.wikimedia.org.key
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/files/ssl/lists.wikimedia.org.key
@@ -0,0 +1 @@
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic02d7894cb2418aaeab809928ae009a7a137aa58
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mail: hiera-ise mailman and lists - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mail: hiera-ise mailman and lists
..

mail: hiera-ise mailman and lists

Add default hiera values and turn hard coded values into hiera strings.
This adds supports for having puppetised and working mailman in labs allowing
us to replicate production, test changes like base::firewall and compatibility
of current puppet code with Debian Jessie.

Change-Id: I877a50737ccb141fb2a51e557a2abafefd1e6da6
---
A hieradata/role/common/mailman.yaml
M manifests/role/mail.pp
M modules/mailman/manifests/webui.pp
M modules/mailman/templates/lists.wikimedia.org.erb
4 files changed, 24 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/224210/1

diff --git a/hieradata/role/common/mailman.yaml 
b/hieradata/role/common/mailman.yaml
new file mode 100644
index 000..023c4e5
--- /dev/null
+++ b/hieradata/role/common/mailman.yaml
@@ -0,0 +1,3 @@
+mailman::lists_ipv4: '208.80.154.4'
+mailman::lists_ipv6: '2620:0:861:1::2'
+mailman::lists_servername: 'lists.wikimedia.org'
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 29d6bff..5ab45ee 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -81,13 +81,13 @@
 
 interface::ip { 'lists.wikimedia.org_v4':
 interface = 'eth0',
-address   = '208.80.154.4',
+address   = hiera('mailman::lists_ipv4'),
 prefixlen = '32',
 }
 
 interface::ip { 'lists.wikimedia.org_v6':
 interface = 'eth0',
-address   = '2620:0:861:1::2',
+address   = hiera('mailman::lists_ipv6'),
 prefixlen = '128',
 }
 
diff --git a/modules/mailman/manifests/webui.pp 
b/modules/mailman/manifests/webui.pp
index cf7fcc3..2a1f1fd 100644
--- a/modules/mailman/manifests/webui.pp
+++ b/modules/mailman/manifests/webui.pp
@@ -9,6 +9,7 @@
 'auth_digest',
 ]: }
 
+$lists_servername = hiera('mailman::lists_servername')
 $ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '365')
 apache::site { 'lists.wikimedia.org':
 content = template('mailman/lists.wikimedia.org.erb'),
diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index 7561e52..1f2e774 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -2,14 +2,14 @@
 
 VirtualHost *:80
 ServerAdmin webmas...@wikimedia.org
-ServerName lists.wikimedia.org
+ServerName = @lists_servername %
 RewriteEngine on
-RewriteRule ^/(.*)$ https://lists.wikimedia.org/$1 [R=301]
+RewriteRule ^/(.*)$ https://= @lists_servername %/$1 [R=301]
 /VirtualHost
 
 VirtualHost *:443
 ServerAdmin webmas...@wikimedia.org
-ServerName lists.wikimedia.org
+ServerName = @lists_servername %
 SSLEngine On
 SSLCertificateFile /etc/ssl/localcerts/lists.wikimedia.org.crt
 SSLCertificateChainFile /etc/ssl/localcerts/lists.wikimedia.org.chain.crt
@@ -42,8 +42,8 @@
 Alias /pipermail/ /var/lib/mailman/archives/public/
 Alias /images//usr/share/images/
 
-RedirectMatch permanent ^/(index\.html?)?$ 
https://lists.wikimedia.org/mailman/listinfo
-RedirectMatch permanent ^/mailman/$
https://lists.wikimedia.org/mailman/listinfo
+RedirectMatch permanent ^/(index\.html?)?$ https://= @lists_servername 
%/mailman/listinfo
+RedirectMatch permanent ^/mailman/$https://= @lists_servername 
%/mailman/listinfo
 
 # arbcom-l paranoia. Contact Tim Starling for details/rationale
 LocationMatch ^/mailman/(private|admin)/arbcom-l(/.*|$)
@@ -69,18 +69,18 @@
 RewriteRule ^(.*)$ - [F]
 
 # list renames
-Redirect permanent /mailman/listinfo/foundation-l 
https://lists.wikimedia.org/mailman/listinfo/wikimedia-l
-Redirect permanent /mailman/listinfo/museum-l 
https://lists.wikimedia.org/mailman/listinfo/glam
-Redirect permanent /mailman/listinfo/mediawiki-cvs
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
-Redirect permanent /mailman/listinfo/wsor 
https://lists.wikimedia.org/mailman/listinfo/wmfresearch
-Redirect permanent /mailman/listinfo/chaptercommittee-l   
https://lists.wikimedia.org/mailman/listinfo/affcom
-Redirect permanent /mailman/listinfo/allhands 
https://lists.wikimedia.org/mailman/listinfo/wmfreqs
-Redirect permanent /mailman/listinfo/research-team
https://lists.wikimedia.org/mailman/listinfo/research-internal
-Redirect permanent /mailman/listinfo/wikidata-l   
https://lists.wikimedia.org/mailman/listinfo/wikidata
-Redirect permanent /mailman/listinfo/pywikipedia-l
https://lists.wikimedia.org/mailman/listinfo/pywikibot
-Redirect permanent /mailman/listinfo/pywikipedia-announce 

[MediaWiki-commits] [Gerrit] static bugzilla: add https check - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: static bugzilla: add https check
..

static bugzilla: add https check

Bug: T104948
Change-Id: Id3c405412b607c5e7ea39da58cdada2c74ec9299
---
M manifests/role/bugzilla_static.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/223364/1

diff --git a/manifests/role/bugzilla_static.pp 
b/manifests/role/bugzilla_static.pp
index 664401a..267e1bf 100644
--- a/manifests/role/bugzilla_static.pp
+++ b/manifests/role/bugzilla_static.pp
@@ -15,5 +15,10 @@
 backup::set { 'bugzilla-backup' : }
 
 include ::bugzilla_static
+
+monitoring::service { 'bugzillastatic-https':
+description   = 'Static Bugzilla HTTPS',
+check_command = 'check_https_url!static-bugzilla.wikimedia.org!/',
+}
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3c405412b607c5e7ea39da58cdada2c74ec9299
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mailman: add missing language templates - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: add missing language templates
..

mailman: add missing language templates

including missing yet translated language templates which are a part of
mailman's i18n. There are more, but these do not exist to mailman. This adds
all languages which completes the language change over.

Bug: T71858
Change-Id: I4c3db85bbd0726810bdbb498f3ef904070ae89ef
---
A modules/mailman/files/templates/he/listinfo.html
A modules/mailman/files/templates/ja/listinfo.html
A modules/mailman/files/templates/ro/listinfo.html
A modules/mailman/files/templates/tr/listinfo.html
4 files changed, 1,084 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/223466/1

diff --git a/modules/mailman/files/templates/he/listinfo.html 
b/modules/mailman/files/templates/he/listinfo.html
new file mode 100644
index 000..4e7c7e3
--- /dev/null
+++ b/modules/mailman/files/templates/he/listinfo.html
@@ -0,0 +1,271 @@
+!DOCTYPE html
+!-- Version: 1.5 --
+html lang=he
+  head
+titleMM-List-Name רשימות תפוצה - ויקימדיה/title
+style
+  html, body {
+height: 100%;
+  }
+  body {
+margin: 0px;
+padding: 0px;
+background: #F0F0F0;
+font-family: 'Open Sans', sans-serif;
+font-size: 13px;
+color: #252525;
+  }   
+  h1, h2, h3 {
+margin: 0;
+padding: 0;
+  }
+  p, ol, ul {
+margin-top: 0px;
+  }
+  p {
+line-height: 180%;
+  }
+  a {
+color: #FF;
+  }
+  a:hover {
+text-decoration: none;
+  }
+  a img {
+border: none;
+  }
+  img.border {
+  }
+  img.alignleft {
+float: left;
+  }
+  img.alignright {
+float: right;
+  }
+  img.aligncenter {
+margin: 0px auto;
+margin-top: -25px;
+padding-bottom: 10px;
+  }
+  hr {
+display: none;
+  }
+
+/** WRAPPER */
+
+  .container {
+width: 1000px;
+margin: 0px auto;
+  }
+
+/** MENU */
+
+  #menu {
+#float: right;
+#width: 600px;
+#height: 99px;
+  }
+  #menu ul {
+#float: right;
+margin-left: -25px;
+#padding: 40x 0px;
+list-style: none;
+line-height: normal;
+  }
+  #menu li {
+#float: left;
+#margin-left: 2em;
+  }
+  #menu a {
+display: block;
+padding: 10px 0px;
+letter-spacing: 2px;
+text-decoration: none;
+text-transform: uppercase;
+font-family: 'Archivo Narrow', sans-serif;
+font-size: 1.10em;
+font-weight: 600;
+color: #252525;
+  }
+  #menu .active a {
+background: #0091E6;
+border-radius: 5px;
+color: #FF;
+  }
+  #menu a:hover {
+text-decoration: underline;
+  }
+
+/** PAGE */
+
+  #page {
+overflow: hidden;
+width: 900px;
+padding: 50px 30px 30px 30px;
+background-color: #FF;
+border-radius: 10px 10px 10px 10px;
+  }
+  #page h2 {
+margin-bottom: 30px;
+  }
+
+/** CONTENT */
+
+  #content {
+float: right;
+width: 660px;
+  }
+  #content #onecolumn {
+padding-bottom: 15px;
+border-bottom: 1px solid #D4D4D4;
+  }
+  #content h2 {
+letter-spacing: -1px;
+font-size: 3em;
+  }
+
+/** SIDEBAR */
+
+  #sidebar {
+float: left;
+width: 220px;
+padding-top: 0px;
+  }
+  #sidebar #sbox1 {
+margin-bottom: 40px;
+  }
+  #sidebar #sbox2 {
+overflow: hidden;
+margin-bottom: 50px;
+  }
+  #sidebar #sbox3 {
+overflow: hidden;
+  }
+
+/** FOOTER */
+  
+  #copyright{
+overflow: hidden;
+width: 900px;
+padding: 50px;
+  }
+  #copyright p {
+text-align: center;
+#text-shadow: 1px 1px 1px rgba(0,0,0,1);
+  }
+  #copyright a {
+  color: #4E4E4E;
+  }
+
+/** BODY */
+
+  #two-column {
+padding-top: 30px;
+  }
+  .box-content {
+overflow: hidden;
+margin-bottom: 2em;
+  }
+  .box-content p {
+padding-left: 60px;
+  }
+  .title {
+display: block;
+padding-left: 60px;
+padding-bottom: 1em;
+font-size: 1.70em !important;
+font-weight: 600;
+color: #252525;
+  }
+  .title01 {
+background: 
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/5a/News_subscribe.png/40px-News_subscribe.png)
 no-repeat left top;
+  }
+  .title02 {
+background: 

[MediaWiki-commits] [Gerrit] mail: ferm rules for mailman - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mail: ferm rules for mailman
..

mail: ferm rules for mailman

Add basic ferm rules for mailman service (web and smtp). TODO: check if any
other ports are open on sodium and add them.

Bug: T104980
Change-Id: If26277b0322e01491236f037d6ab764d63e0f33e
---
M manifests/role/mail.pp
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/223279/1

diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index c58441e..dc6af82 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -193,4 +193,18 @@
 timeout   = '30',
 }
 
+ferm::service { 'mailman-smtp':
+proto = 'tcp',
+port  = '25',
+}
+
+ferm::service { 'mailman-http':
+proto = 'tcp',
+port  = '80',
+}
+
+ferm::service { 'mailman-https':
+proto = 'tcp',
+port  = '443',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If26277b0322e01491236f037d6ab764d63e0f33e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] reclaim lanthanum: remove lanthanum.eqaid.wmnet - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: reclaim lanthanum: remove lanthanum.eqaid.wmnet
..

reclaim lanthanum: remove lanthanum.eqaid.wmnet

keep lanthanum.mgmt.eqiad.wmnet though as it is a misc server and will
likely be reused (as this is a reclaim).

Bug: T86658
Change-Id: Ib1e6df7a1e7cef7821248eb5f7890828f6fdc85d
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/67/223167/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 9786cb8..9865542 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -334,7 +334,7 @@
 113 1H IN PTR   elastic1006.eqiad.wmnet.
 120 1H IN PTR   snapshot1001.eqiad.wmnet.
 121 1H IN PTR   snapshot1002.eqiad.wmnet.
-161 1H IN PTR   lanthanum.eqiad.wmnet.
+
 162 1H IN PTR   logstash1004.eqiad.wmnet.
 
 164 1H IN PTR   strontium.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index f2d408b..9bc5b9d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -374,7 +374,6 @@
 labvirt1004 1H  IN A10.64.20.22
 labvirt1005 1H  IN A10.64.20.23
 labvirt1006 1H  IN A10.64.20.24
-lanthanum   1H  IN A10.64.0.161
 mc1001  1H  IN A10.64.0.180
 mc1002  1H  IN A10.64.0.181
 mc1003  1H  IN A10.64.0.182

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1e6df7a1e7cef7821248eb5f7890828f6fdc85d
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] (www.)wmfusercontent.org point to text-lb - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: (www.)wmfusercontent.org point to text-lb
..

(www.)wmfusercontent.org point to text-lb

point the main domain to text-lb so it gives a response and directs to the
main apache cluster producing the standard 'global project portal' page.

Bug: T104735
Change-Id: I29cf7546e4c4cec2bf1babbec29f5084abce5e68
---
M templates/wmfusercontent.org
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/60/222860/1

diff --git a/templates/wmfusercontent.org b/templates/wmfusercontent.org
index f4d491e..9de7fde 100644
--- a/templates/wmfusercontent.org
+++ b/templates/wmfusercontent.org
@@ -18,6 +18,7 @@
 ; Mail exchangers
 
 ; Canonical names
+600 IN DYNA geoip!text-addrs
 
 ; Servers (alphabetic order)
 phab1H  IN CNAMEmisc-web-lb.eqiad.wikimedia.org.
@@ -25,5 +26,6 @@
 ; Service aliases
 
 ; Wikis (alphabetic order)
+www 600 IN DYNA geoip!text-addrs
 
 ; Other websites

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29cf7546e4c4cec2bf1babbec29f5084abce5e68
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] (www.)wmfusercontent.org point to text-lb - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: (www.)wmfusercontent.org point to text-lb
..

(www.)wmfusercontent.org point to text-lb

point the main domain to text-lb so it gives a response and directs to the
main apache cluster producing the standard 'global project portal' page.

Bug: T104735
Change-Id: I4d72808bb221924c1234f28264ee59a68b3838ae
---
M templates/wmfusercontent.org
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/59/222859/1

diff --git a/templates/wmfusercontent.org b/templates/wmfusercontent.org
index f4d491e..5ab6828 100644
--- a/templates/wmfusercontent.org
+++ b/templates/wmfusercontent.org
@@ -18,6 +18,7 @@
 ; Mail exchangers
 
 ; Canonical names
+600 IN DYNA geoip!text-addrs
 
 ; Servers (alphabetic order)
 phab1H  IN CNAMEmisc-web-lb.eqiad.wikimedia.org.
@@ -25,5 +26,6 @@
 ; Service aliases
 
 ; Wikis (alphabetic order)
+www 600 IN DYNA geoip!text-addes
 
 ; Other websites

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d72808bb221924c1234f28264ee59a68b3838ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] remove db-secondary.php - change (operations/mediawiki-config)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: remove db-secondary.php
..

remove db-secondary.php

Seems outdated, no use from what I can see in the config. If this is
unmaintained, is it really needed/useful?

Change-Id: Id8de060f6ec5e088a9753e1248b9da07ec6357d7
---
D docroot/noc/conf/db-secondary.php.txt
M docroot/noc/createTxtFileSymlinks.sh
D wmf-config/db-secondary.php
3 files changed, 0 insertions(+), 69 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/89/89/1

diff --git a/docroot/noc/conf/db-secondary.php.txt 
b/docroot/noc/conf/db-secondary.php.txt
deleted file mode 12
index 1f4f69e..000
--- a/docroot/noc/conf/db-secondary.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/db-secondary.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh 
b/docroot/noc/createTxtFileSymlinks.sh
index dad28a0..79a519e 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -14,7 +14,6 @@
CirrusSearch-labs.php
db-eqiad.php
db-labs.php
-   db-secondary.php
ext-labs.php
ext-production.php
filebackend-labs.php
diff --git a/wmf-config/db-secondary.php b/wmf-config/db-secondary.php
deleted file mode 100644
index f228bca..000
--- a/wmf-config/db-secondary.php
+++ /dev/null
@@ -1,67 +0,0 @@
-?php
-# WARNING: This file is publically viewable on the web. Do not put private 
data here.
-
-# Seconday Load lists
-#
-# This file is not used by MW but documents
-# slaves in other environments that need their
-# schemas kept in sync.  It can be included to
-# override the production db list by upgrade
-# scripts.
-#
-$wgLBFactoryConf['sectionLoads'] = array(
-   's1' = array(
-   '' = 0,
-   'db1017'= 1, # 1.4TB secondary master
-   'db1001'= 1, # 1.4TB sas
-   'db1042'= 1, # 1.4TB sas
-   'db1049'= 1, # 2.8TB sas
-   'db1050'= 1, # snapshot 2.8TB sas
-   'db1043'= 1, # 1.4TB sas
-   'db1047'  = 1, # analytics
-   'db67'  = 1, # analytics
-   ),
-   's2' = array(
-''  = 0,
-   'db1034'= 1, # secondary master
-   'db1002'= 1,
-   'db1009'= 1,
-   'db1018'= 1, # snaphsot
-   ),
-   /* s3 */ 'DEFAULT' = array(
-''  = 0,
-   'db1019'= 1, # secondary master
-   'db1003'= 1,
-   'db1010'= 1,
-   'db1035'= 1, # snapshot
-   ),
-   's4' = array(
-''  = 0,
-   'db1038'   = 1, # secondary master
-   'db1004'   = 1,
-   'db1011'   = 1,
-   'db1020'   = 1, # snapshot
-   ),
-   's5' = array(
-''  = 0,
-   'db1039'   = 1, # secondary master
-   'db1005'   = 1, # snapshot
-   'db1026'   = 1,
-   'db1021'   = 1,
-   ),
-   's6' = array(
-''  = 0,
-   'db1006'   = 1, # secondary master
-   'db1022'   = 1, # snapshot
-   'db1027'   = 1,
-   'db1040'   = 1,
-   ),
-   's7' = array(
-''  = 0,
-   'db1041' = 1, # secondary master
-   'db1007' = 1, # snapshot
-   'db1024' = 1,
-   'db1028' = 1,
-   ),
-);
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8de060f6ec5e088a9753e1248b9da07ec6357d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] refresh symlinks to catch new dblists - change (operations/mediawiki-config)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: refresh symlinks to catch new dblists
..

refresh symlinks to catch new dblists

Change-Id: I7ecae6fbeff958865c9ef2fa9441ed0a2c06a774
---
A docroot/noc/conf/mediaviewer.dblist
A docroot/noc/conf/nonglobal.dblist
A docroot/noc/conf/visualeditor.dblist
3 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/90/90/1

diff --git a/docroot/noc/conf/mediaviewer.dblist 
b/docroot/noc/conf/mediaviewer.dblist
new file mode 12
index 000..dc867c9
--- /dev/null
+++ b/docroot/noc/conf/mediaviewer.dblist
@@ -0,0 +1 @@
+../../../mediaviewer.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/nonglobal.dblist 
b/docroot/noc/conf/nonglobal.dblist
new file mode 12
index 000..0a19a7f
--- /dev/null
+++ b/docroot/noc/conf/nonglobal.dblist
@@ -0,0 +1 @@
+../../../nonglobal.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/visualeditor.dblist 
b/docroot/noc/conf/visualeditor.dblist
new file mode 12
index 000..8bc4252
--- /dev/null
+++ b/docroot/noc/conf/visualeditor.dblist
@@ -0,0 +1 @@
+../../../visualeditor.dblist
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ecae6fbeff958865c9ef2fa9441ed0a2c06a774
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add bromine to dhcp - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add bromine to dhcp
..

add bromine to dhcp

bromine is a vm in ganeti which will host static-bugzilla.wm.o

Change-Id: Idb0e10a2a00ca7b1203b0eceb08ebf25d9299eb9
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/222172/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 036cccd..c851cb1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.cfg;; \
-   etherpad[12]001|planet1001) echo partman/flat.cfg virtual.cfg 
;; \
+   etherpad[12]001|planet1001|bromine) echo partman/flat.cfg 
virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sca100[1-2]) echo 
partman/raid1.cfg ;; \
francium) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 1361697..adcc162 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -24,6 +24,13 @@
fixed-address analytics1010.eqiad.wmnet;
 }
 
+host bromine.eqaid.wmnet {
+   hardware ethernet aa:00:00:f1:36:3a;
+   fixed-address bromine.eqiad.wmnet;
+   option pxelinux.pathprefix jessie-installer/;
+   filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
 host labsdb1001 {
hardware ethernet 00:22:BD:D3:61:8C;
fixed-address labsdb1001.eqiad.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb0e10a2a00ca7b1203b0eceb08ebf25d9299eb9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] install-server: rename module to install_server - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: install-server: rename module to install_server
..

install-server: rename module to install_server

So it matches puppet naming standards and doesn't have any dashes in the
module name.

Change-Id: Icb2122da0a43b7a18e8a1166a92057328ca95be1
---
A modules/install_server/.rspec
A modules/install_server/README.md
A modules/install_server/Rakefile
A modules/install_server/files/atftpd-default
A modules/install_server/files/autoinstall/common.cfg
A modules/install_server/files/autoinstall/jessie.cfg
A modules/install_server/files/autoinstall/keyring/wikimedia-archive-keyring.gpg
A modules/install_server/files/autoinstall/netboot.cfg
A modules/install_server/files/autoinstall/override.cfg
A modules/install_server/files/autoinstall/partman/analytics-cisco.cfg
A modules/install_server/files/autoinstall/partman/analytics-dell.cfg
A modules/install_server/files/autoinstall/partman/analytics-flex.cfg
A modules/install_server/files/autoinstall/partman/cassandrahosts-2ssd.cfg
A modules/install_server/files/autoinstall/partman/cassandrahosts-3ssd.cfg
A modules/install_server/files/autoinstall/partman/db.cfg
A modules/install_server/files/autoinstall/partman/elasticsearch.cfg
A modules/install_server/files/autoinstall/partman/flat.cfg
A modules/install_server/files/autoinstall/partman/ganeti-raid1.cfg
A modules/install_server/files/autoinstall/partman/ganeti.cfg
A modules/install_server/files/autoinstall/partman/graphite-dmcache.cfg
A modules/install_server/files/autoinstall/partman/graphite.cfg
A modules/install_server/files/autoinstall/partman/logstash.cfg
A modules/install_server/files/autoinstall/partman/lvm-etcd.cfg
A modules/install_server/files/autoinstall/partman/lvm-noraid-large.a.cfg
A modules/install_server/files/autoinstall/partman/lvm.cfg
A modules/install_server/files/autoinstall/partman/mailserver.cfg
A modules/install_server/files/autoinstall/partman/mc.cfg
A modules/install_server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
A modules/install_server/files/autoinstall/partman/ms-be-eqiad.cfg
A modules/install_server/files/autoinstall/partman/ms-be-esams.cfg
A modules/install_server/files/autoinstall/partman/mw.cfg
A modules/install_server/files/autoinstall/partman/osmlabsdb.cfg
A modules/install_server/files/autoinstall/partman/raid0-lvm.cfg
A modules/install_server/files/autoinstall/partman/raid1-1partition.cfg
A modules/install_server/files/autoinstall/partman/raid1-30G.cfg
A modules/install_server/files/autoinstall/partman/raid1-gpt.cfg
A modules/install_server/files/autoinstall/partman/raid1-lvm-conf.cfg
A modules/install_server/files/autoinstall/partman/raid1-lvm-ext4-srv.cfg
A modules/install_server/files/autoinstall/partman/raid1-lvm-ext4.cfg
A modules/install_server/files/autoinstall/partman/raid1-lvm.cfg
A modules/install_server/files/autoinstall/partman/raid1-squid.cfg
A modules/install_server/files/autoinstall/partman/raid1-varnish.cfg
A modules/install_server/files/autoinstall/partman/raid1.cfg
A modules/install_server/files/autoinstall/partman/raid10-gpt.cfg
A modules/install_server/files/autoinstall/partman/raid5-gpt-lvm.cfg
A modules/install_server/files/autoinstall/partman/raid5-gpt.cfg
A modules/install_server/files/autoinstall/partman/snapshot.cfg
A modules/install_server/files/autoinstall/partman/varnish-oldssd.cfg
A modules/install_server/files/autoinstall/partman/varnish.cfg
A modules/install_server/files/autoinstall/partman/virt-hp.cfg
A modules/install_server/files/autoinstall/partman/virt-raid10-cisco.cfg
A modules/install_server/files/autoinstall/passwd.cfg
A modules/install_server/files/autoinstall/precise.cfg
A modules/install_server/files/autoinstall/preseed.cfg
A modules/install_server/files/autoinstall/scripts/early_command
A modules/install_server/files/autoinstall/scripts/late_command
A modules/install_server/files/autoinstall/scripts/partman_early_command
A modules/install_server/files/autoinstall/ssh/authorized_keys
A modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg
A modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
A modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg
A modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg
A 

[MediaWiki-commits] [Gerrit] add planet1001 as a VM - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add planet1001 as a VM
..

add planet1001 as a VM

A VM in the eqiad cluster, add using information given on the ticket
creation by Alex.

Bug: T101730
Change-Id: I5159677bbd32833e30370e7cfee801fe93bf4f37
---
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/220310/1

diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 7b07218..f6546b0 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo 
partman/elasticsearch.cfg ;; \
etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.cfg;; \
-   etherpad[12]001) echo partman/flat.cfg virtual.cfg ;; \
+   etherpad[12]001|planet1001) echo partman/flat.cfg virtual.cfg 
;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sca100[1-2]) echo 
partman/raid1.cfg ;; \
francium) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
index c768989..5fdb617 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -82,6 +82,13 @@
fixed-address pc1003.eqiad.wmnet;
 }
 
+host planet1001 {
+   hardware ethernet aa:00:00:19:24:b9;
+   fixed-address planet1001.eqiad.wmnet;
+   option pxelinux.pathprefix jessie-installer/;
+   filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
 host virt1001 {
hardware ethernet 88:43:e1:c2:99:8e;
fixed-address virt1001.eqiad.wmnet;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5159677bbd32833e30370e7cfee801fe93bf4f37
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] adjust ssl check thresholds (more sane) - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: adjust ssl check thresholds (more sane)
..

adjust ssl check thresholds (more sane)

After a quick chat on IRC, the SSL cert thresholds could do with more
adjusting to make them more sane for current workflows. A real escalation
systems make sense so adding a warning threshold higher than critical.
Making critical 30 and warning 60 as the 90 day part was legacy and warning
when a cert has at least 25% of its life left is weird.

Change-Id: Ida3e5463766ff04c50640bef7905e116661ee785
---
M modules/nagios_common/files/check_commands/check_ssl.cfg
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/220342/1

diff --git a/modules/nagios_common/files/check_commands/check_ssl.cfg 
b/modules/nagios_common/files/check_commands/check_ssl.cfg
index 59a7385..3f73276 100644
--- a/modules/nagios_common/files/check_commands/check_ssl.cfg
+++ b/modules/nagios_common/files/check_commands/check_ssl.cfg
@@ -1,11 +1,11 @@
 # Verify a SSL certificate is valid and not going to expire
 define command{
 command_namecheck_ssl_http
-command_line$USER1$/check_ssl --critical 90 -H $HOSTADDRESS$ -p 443 
--cn $ARG1$
+command_line$USER1$/check_ssl --warning 60 --critical 30 -H 
$HOSTADDRESS$ -p 443 --cn $ARG1$
 }
 
 # check SSL certs on LDAP servers
 define command{
 command_namecheck_ssl_ldap
-command_line$USER1$/check_ssl --critical 90 -H $HOSTADDRESS$ -p 636 
--cn $ARG1$
+command_line$USER1$/check_ssl --warning 60 --critical 30 -H 
$HOSTADDRESS$ -p 636 --cn $ARG1$
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida3e5463766ff04c50640bef7905e116661ee785
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] switch old-bugzilla to apache cluster - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: switch old-bugzilla to apache cluster
..

switch old-bugzilla to apache cluster

Change-Id: Ibbaf20b9a40dc6d55b494bd6da571da5a3b0786c
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/36/216736/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 398e89c..401c816 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -633,7 +633,7 @@
 metrics  1H  IN CNAMEmisc-web-lb.eqiad
 noc  1H  IN CNAMEmisc-web-lb.eqiad
 nyc  600 IN DYNA geoip!text-addrs
-old-bugzilla 1H  IN CNAMEmisc-web-lb.eqiad
+old-bugzilla 1H  IN DYNA geoip!text-addrs
 planet   1H  IN CNAMEmisc-web-lb.eqiad
 ar.planet1H  IN CNAMEmisc-web-lb.eqiad
 ca.planet1H  IN CNAMEmisc-web-lb.eqiad

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbaf20b9a40dc6d55b494bd6da571da5a3b0786c
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] redirect old- to static-bugzilla - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: redirect old- to static-bugzilla
..

redirect old- to static-bugzilla

Change-Id: I2b8961677b2d729220fa337d2a0ac1ff82eb401a
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
M templates/varnish/misc.inc.vcl.erb
3 files changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/216734/1

diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index ca9ee94..37a4d8b 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -375,6 +375,7 @@
mobile.wikipedia.org \
techblog.wikimedia.org \
dev.wikimedia.org \
+   old-bugzilla.wikimedia.org \
 
# allow caching for redirects
IfModule mod_headers.c
@@ -842,10 +843,10 @@
# funnelintegration.mediawiki.org   
https://integration.wikimedia.org
RewriteCond %{HTTP_HOST} =integration.mediawiki.org
RewriteRule . https://integration.wikimedia.org/ [R=301,L,NE]
-   # funnel docs.mediawiki.org https://doc.wikimedia.org
+   # funneldocs.mediawiki.org https://doc.wikimedia.org
RewriteCond %{HTTP_HOST} =docs.mediawiki.org
RewriteRule . https://doc.wikimedia.org/ [R=301,L,NE]
-   # funnel docs.wikimedia.org https://doc.wikimedia.org
+   # funneldocs.wikimedia.org https://doc.wikimedia.org
RewriteCond %{HTTP_HOST} =docs.wikimedia.org
RewriteRule . https://doc.wikimedia.org/ [R=301,L,NE]
# rewrite   nostalgia.wikimedia.org //nostalgia.wikipedia.org
@@ -932,6 +933,9 @@
# funneldev.wikimedia.org   
//www.mediawiki.org/wiki/API:Data_and_developer_hub
RewriteCond %{HTTP_HOST} =dev.wikimedia.org
RewriteRule . 
%{ENV:RW_PROTO}://www.mediawiki.org/wiki/API:Data_and_developer_hub [R=301,L,NE]
+   # rewrite   old-bugzilla.wikimedia.org  
//static-bugzilla.wikimedia.org
+   RewriteCond %{HTTP_HOST} =old-bugzilla.wikimedia.org
+   RewriteRule .* %{ENV:RW_PROTO}://static-bugzilla.wikimedia.org$0 
[R=301,L,NE]
 
# Type: wildcard
# funnel*wikijunior.com //en.wikibooks.org/wiki/Wikijunior
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 97ffba3..e57ee6c 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -512,3 +512,5 @@
 # dev.wikimedia.org - T372
 funnel dev.wikimedia.org   
//www.mediawiki.org/wiki/API:Data_and_developer_hub
 
+# rewrite old-bugzilla to the static version
+rewriteold-bugzilla.wikimedia.org  //static-bugzilla.wikimedia.org
diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 9a8cfd8..83130ab 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -28,7 +28,7 @@
set req.backend = californium;
} elsif (req.http.Host == phabricator.wikimedia.org || req.http.Host 
== phab.wmfusercontent.org || req.http.Host == bugzilla.wikimedia.org || 
req.http.Host == bugs.wikimedia.org) {
set req.backend = iridium;
-   } elsif (req.http.Host == old-bugzilla.wikimedia.org || req.http.Host 
== static-bugzilla.wikimedia.org || req.http.Host == 
bug-attachment.wikimedia.org || req.http.Host ==dev.wikimedia.org) {
+   } elsif (req.http.Host == static-bugzilla.wikimedia.org || 
req.http.Host == bug-attachment.wikimedia.org || req.http.Host 
==dev.wikimedia.org) {
set req.backend = zirconium;
return (pass);
} elsif (req.http.Host == svn.wikimedia.org) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b8961677b2d729220fa337d2a0ac1ff82eb401a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Remove old-bugzilla DNS entry - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Remove old-bugzilla DNS entry
..

Remove old-bugzilla DNS entry

Change-Id: I5ebd874e497216f85483a602d5269bb3d760826b
---
M templates/wikimedia.org
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/17/216717/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 398e89c..e838857 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -633,7 +633,6 @@
 metrics  1H  IN CNAMEmisc-web-lb.eqiad
 noc  1H  IN CNAMEmisc-web-lb.eqiad
 nyc  600 IN DYNA geoip!text-addrs
-old-bugzilla 1H  IN CNAMEmisc-web-lb.eqiad
 planet   1H  IN CNAMEmisc-web-lb.eqiad
 ar.planet1H  IN CNAMEmisc-web-lb.eqiad
 ca.planet1H  IN CNAMEmisc-web-lb.eqiad

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ebd874e497216f85483a602d5269bb3d760826b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] pywikipedia-pywikibot in mailman - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: pywikipedia-pywikibot in mailman
..

pywikipedia-pywikibot in mailman

Bug: T100707
Change-Id: I5eb7d67d68ab8122f419f98f6e66722bf43e8a2b
---
M files/exim/listserver_aliases
M modules/mailman/templates/lists.wikimedia.org.erb
2 files changed, 24 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/214694/1

diff --git a/files/exim/listserver_aliases b/files/exim/listserver_aliases
index ccda04c..41c4ee6 100644
--- a/files/exim/listserver_aliases
+++ b/files/exim/listserver_aliases
@@ -1,12 +1,15 @@
 # @lists.wikimedia.org aliases
-mailman-bounces::blackhole:
+mailman-bounces:  :blackhole:
 
-boardexec:  board-l
-foundation-l:   wikimedia-l
-museum-l:   glam
-mediawiki-cvs:  mediawiki-commits
-wsor:   wmfresearch
-chaptercommittee-l: affcom
-allhands:   wmfreqs
-research-team:  research-internal
-wikidata-l: wikidata
+boardexec:board-l
+foundation-l: wikimedia-l
+museum-l: glam
+mediawiki-cvs:mediawiki-commits
+wsor: wmfresearch
+chaptercommittee-l:   affcom
+allhands: wmfreqs
+research-team:research-internal
+wikidata-l:   wikidata
+pywikipedia-l:pywikibot
+pywikipedia-announce: pywikibot-announce
+pywikipedia-bugs: pywikibot-bugs
diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index 51733db..d2f1d36 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -69,14 +69,17 @@
 RewriteRule ^(.*)$ - [F]
 
 # list renames
-Redirect permanent /mailman/listinfo/foundation-l   
https://lists.wikimedia.org/mailman/listinfo/wikimedia-l
-Redirect permanent /mailman/listinfo/museum-l   
https://lists.wikimedia.org/mailman/listinfo/glam
-Redirect permanent /mailman/listinfo/mediawiki-cvs  
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
-Redirect permanent /mailman/listinfo/wsor   
https://lists.wikimedia.org/mailman/listinfo/wmfresearch
-Redirect permanent /mailman/listinfo/chaptercommittee-l 
https://lists.wikimedia.org/mailman/listinfo/affcom
-Redirect permanent /mailman/listinfo/allhands   
https://lists.wikimedia.org/mailman/listinfo/wmfreqs
-Redirect permanent /mailman/listinfo/research-team  
https://lists.wikimedia.org/mailman/listinfo/research-internal
-Redirect permanent /mailman/listinfo/wikidata-l 
https://lists.wikimedia.org/mailman/listinfo/wikidata
+Redirect permanent /mailman/listinfo/foundation-l 
https://lists.wikimedia.org/mailman/listinfo/wikimedia-l
+Redirect permanent /mailman/listinfo/museum-l 
https://lists.wikimedia.org/mailman/listinfo/glam
+Redirect permanent /mailman/listinfo/mediawiki-cvs
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
+Redirect permanent /mailman/listinfo/wsor 
https://lists.wikimedia.org/mailman/listinfo/wmfresearch
+Redirect permanent /mailman/listinfo/chaptercommittee-l   
https://lists.wikimedia.org/mailman/listinfo/affcom
+Redirect permanent /mailman/listinfo/allhands 
https://lists.wikimedia.org/mailman/listinfo/wmfreqs
+Redirect permanent /mailman/listinfo/research-team
https://lists.wikimedia.org/mailman/listinfo/research-internal
+Redirect permanent /mailman/listinfo/wikidata-l   
https://lists.wikimedia.org/mailman/listinfo/wikidata
+Redirect permanent /mailman/listinfo/pywikipedia-l
https://lists.wikimedia.org/mailman/listinfo/pywikibot
+Redirect permanent /mailman/listinfo/pywikipedia-announce 
https://lists.wikimedia.org/mailman/listinfo/pywikibot-announce
+Redirect permanent /mailman/listinfo/pywikipedia-bugs 
https://lists.wikimedia.org/mailman/listinfo/pywikibot-bugs
 
 ErrorLog /var/log/apache2/lists.wikimedia.org-error.log
 CustomLog /var/log/apache2/lists.wikimedia.org-access.log combined

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb7d67d68ab8122f419f98f6e66722bf43e8a2b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add bugzilla to dumps.wm.o - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add bugzilla to dumps.wm.o
..

add bugzilla to dumps.wm.o

Change-Id: I77acb39bcda8f12dc589046ce5b19c3992b743e5
---
M modules/dataset/files/html/other_index.html
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/214770/1

diff --git a/modules/dataset/files/html/other_index.html 
b/modules/dataset/files/html/other_index.html
index cf5dd90..7603ad8 100644
--- a/modules/dataset/files/html/other_index.html
+++ b/modules/dataset/files/html/other_index.html
@@ -126,6 +126,7 @@
a href=diffdbApril 2011 English language Wikipedia 
revisions as additions/removals to the previous text/abr /
a href=scanset/1911 Edition of the Encyclopedia 
Britannica, scanned as tiff files/abr /
a href=wep/User signup data for the Wikipedia 
Education Program/a
+   a href=bugzilla/Sanitized Bugzilla database dump/a
div class=visualClear/div
/div
/div

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77acb39bcda8f12dc589046ce5b19c3992b743e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mira: add to salt_peer_run - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mira: add to salt_peer_run
..

mira: add to salt_peer_run

Change-Id: I1cedc5c395a3bab1ec41b2fbe47e4456b6a2e8b5
---
M manifests/role/salt.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/212822/1

diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 50e06cc..9300cf9 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -9,7 +9,8 @@
 class { 'salt::master':
 salt_runner_dirs= ['/srv/runners'],
 salt_peer_run   = {
-'tin.eqiad.wmnet' = ['deploy.*'],
+'tin.eqiad.wmnet'  = ['deploy.*'],
+'mira.codfw.wmnet' = ['deploy.*'],
 },
 salt_file_roots = $salt_file_roots,
 salt_pillar_roots   = $salt_pillar_roots,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cedc5c395a3bab1ec41b2fbe47e4456b6a2e8b5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] revert breaking mailman change - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: revert breaking mailman change
..

revert breaking mailman change

added in August and merged a month ago with no restart.
This causes a breaking change with mailman causing a few hours outage
today. Person to trout: Myself.

Change-Id: I1fcda0257dfadb2d1547a7b60740419097bc7db7
---
M modules/mailman/files/mm_cfg.py
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/212188/1

diff --git a/modules/mailman/files/mm_cfg.py b/modules/mailman/files/mm_cfg.py
index 6bb21e0..52fc11b 100644
--- a/modules/mailman/files/mm_cfg.py
+++ b/modules/mailman/files/mm_cfg.py
@@ -123,6 +123,3 @@
 
 # use https for mailman archive links instead of the default http
 PUBLIC_ARCHIVE_URL = 'https://%(hostname)s/pipermail/%(listname)s/'
-
-# see T48049
-SENDER_HEADERS = ('from')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fcda0257dfadb2d1547a7b60740419097bc7db7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add mira to mediawiki-installation dsh - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Add mira to mediawiki-installation dsh
..

Add mira to mediawiki-installation dsh

Bug: T95436
Change-Id: I91a501c048b26e4d1bd0c86d8a201bba4f74dde2
---
M modules/dsh/files/group/mediawiki-installation
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/210938/1

diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index a021155..d7cec49 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -1,5 +1,6 @@
 # !all names added here must be FQDN's now (T93983) !
 
+mira.codfw.wmnet
 silver.wikimedia.org
 tin.eqiad.wmnet
 terbium.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91a501c048b26e4d1bd0c86d8a201bba4f74dde2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] mailman: exim alias and redirect to wikidata-l - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: mailman: exim alias and redirect to wikidata-l
..

mailman: exim alias and redirect to wikidata-l

Change-Id: I89aac2a77541726ef8e2eb4e4f7d04a77ad18728
---
M files/exim/listserver_aliases
M modules/mailman/templates/lists.wikimedia.org.erb
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/211047/1

diff --git a/files/exim/listserver_aliases b/files/exim/listserver_aliases
index 6221efe..ccda04c 100644
--- a/files/exim/listserver_aliases
+++ b/files/exim/listserver_aliases
@@ -9,3 +9,4 @@
 chaptercommittee-l: affcom
 allhands:   wmfreqs
 research-team:  research-internal
+wikidata-l: wikidata
diff --git a/modules/mailman/templates/lists.wikimedia.org.erb 
b/modules/mailman/templates/lists.wikimedia.org.erb
index fb2c11e..51733db 100644
--- a/modules/mailman/templates/lists.wikimedia.org.erb
+++ b/modules/mailman/templates/lists.wikimedia.org.erb
@@ -76,6 +76,7 @@
 Redirect permanent /mailman/listinfo/chaptercommittee-l 
https://lists.wikimedia.org/mailman/listinfo/affcom
 Redirect permanent /mailman/listinfo/allhands   
https://lists.wikimedia.org/mailman/listinfo/wmfreqs
 Redirect permanent /mailman/listinfo/research-team  
https://lists.wikimedia.org/mailman/listinfo/research-internal
+Redirect permanent /mailman/listinfo/wikidata-l 
https://lists.wikimedia.org/mailman/listinfo/wikidata
 
 ErrorLog /var/log/apache2/lists.wikimedia.org-error.log
 CustomLog /var/log/apache2/lists.wikimedia.org-access.log combined

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89aac2a77541726ef8e2eb4e4f7d04a77ad18728
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add mira to deployment network rule - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Add mira to deployment network rule
..

Add mira to deployment network rule

Bug: T95436
Change-Id: If27799985e3f53e588359e6798c5a7735021b6ac
---
M manifests/network.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/209875/1

diff --git a/manifests/network.pp b/manifests/network.pp
index 8d11fe3..c8f352b 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -47,6 +47,7 @@
 ],
 'deployment_hosts' = [
 '10.64.0.196', # tin.eqiad.wmnet
+'10.192.16.132', # mira.codfw.wmnet
 ],
 },
 'labs' = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If27799985e3f53e588359e6798c5a7735021b6ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add deployment server role to mira - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Add deployment server role to mira
..

Add deployment server role to mira

New codfw deployment server.

Bug: T95436
Change-Id: Ic8f1b3472fb48e20c8736173726f474b1715ea9c
---
M manifests/site.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/209874/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 3b7bff4..1dc9340 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1690,8 +1690,11 @@
 
 # codfw deployment host (pending set up)
 node 'mira.codfw.wmnet' {
+$cluster = 'misc'
+
 include standard
 include base::firewall
+include role::deployment::server
 include role::backup::host
 backup::set {'home': }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8f1b3472fb48e20c8736173726f474b1715ea9c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Use Wiki.svg for wikimania2015wiki - change (operations/mediawiki-config)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Use Wiki.svg for wikimania2015wiki
..

Use Wiki.svg for wikimania2015wiki

Requested by Ellie Young and James Alexander.

Change-Id: I831a28265293c92f8f8ab21c7c16c019e73b0df4
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/26/209126/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7d9797e..dc3d613 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1067,7 +1067,7 @@
'wikimania2012wiki' = 
'//upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Wikimania_2012_logo.svg/135px-Wikimania_2012_logo.svg.png',
 // Bug T50382
'wikimania2013wiki' = 
'//upload.wikimedia.org/wikipedia/commons/thumb/5/52/Wikimania_2013_logo.svg/135px-Wikimania_2013_logo.svg.png',
 // Bug T50382
'wikimania2014wiki' = 
'//upload.wikimedia.org/wikipedia/commons/thumb/0/06/Wikimania_2014_Shard_logo_v3_with_logotype_and_date_%28small%29.svg/135px-Wikimania_2014_Shard_logo_v3_with_logotype_and_date_%28small%29.svg.png',
 // Bug T58398
-   'wikimania2015wiki' = 
'//upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Wikimania_2015_logo.svg/135px-Wikimania_2015_logo.svg.png',
 // Bug T50382
+   'wikimania2015wiki' = 
'//upload.wikimedia.org/wikipedia/wikimania2015/f/f0/Wiki.svg', // Bug T50382
'wikimania2016wiki' = 
'//upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Wikimania_2016_logo.svg/135px-Wikimania_2016_logo.svg.png',
 // T85374
'wikimaniateamwiki' = 
'//upload.wikimedia.org/wikipedia/commons/thumb/0/07/Wikimania_team_logo.svg/135px-Wikimania_team_logo.svg.png',
 // Bug T50376
 ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I831a28265293c92f8f8ab21c7c16c019e73b0df4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] [WIP] deploy mira as codfw deployment server - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: [WIP] deploy mira as codfw deployment server
..

[WIP] deploy mira as codfw deployment server

Adds mira as the codfw deployment server, similar task to tin
in eqiad.

Bug: T95436
Change-Id: I42134e081194b582d1514696247398d50e0f8713
---
M manifests/network.pp
M manifests/role/salt.pp
M manifests/site.pp
M modules/dsh/files/group/mediawiki-installation
4 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/208723/1

diff --git a/manifests/network.pp b/manifests/network.pp
index 8d11fe3..c8f352b 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -47,6 +47,7 @@
 ],
 'deployment_hosts' = [
 '10.64.0.196', # tin.eqiad.wmnet
+'10.192.16.132', # mira.codfw.wmnet
 ],
 },
 'labs' = {
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 50e06cc..2f034a4 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -10,6 +10,7 @@
 salt_runner_dirs= ['/srv/runners'],
 salt_peer_run   = {
 'tin.eqiad.wmnet' = ['deploy.*'],
+'mira.codfw.wmnet' = ['deploy.*'],
 },
 salt_file_roots = $salt_file_roots,
 salt_pillar_roots   = $salt_pillar_roots,
diff --git a/manifests/site.pp b/manifests/site.pp
index ae6d31c..2fb390c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1681,6 +1681,19 @@
 include redis::ganglia
 }
 
+node 'mira.codfw.wmnet' {
+$cluster = 'misc'
+
+include standard
+include role::deployment::server
+include mysql
+include role::labsdb::manager
+include role::releases:upload
+
+include role::backup::host
+backup::set {'home': }
+}
+
 node 'multatuli.wikimedia.org' {
 include standard
 
diff --git a/modules/dsh/files/group/mediawiki-installation 
b/modules/dsh/files/group/mediawiki-installation
index a021155..d7cec49 100644
--- a/modules/dsh/files/group/mediawiki-installation
+++ b/modules/dsh/files/group/mediawiki-installation
@@ -1,5 +1,6 @@
 # !all names added here must be FQDN's now (T93983) !
 
+mira.codfw.wmnet
 silver.wikimedia.org
 tin.eqiad.wmnet
 terbium.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42134e081194b582d1514696247398d50e0f8713
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] move scap::master to hieradata - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: move scap::master to hieradata
..

move scap::master to hieradata

Change-Id: I1f8a499022ea42d90f0da81919339d8903aa3c03
---
A hieradata/codfw/scap/master.yaml
A hieradata/common/scap/master.yaml
A hieradata/eqiad/scap/master.yaml
M modules/scap/manifests/master.pp
4 files changed, 16 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/208801/1

diff --git a/hieradata/codfw/scap/master.yaml b/hieradata/codfw/scap/master.yaml
new file mode 100644
index 000..5e14d9c
--- /dev/null
+++ b/hieradata/codfw/scap/master.yaml
@@ -0,0 +1,2 @@
+---
+rsync_host: 'mira.codfw.wmnet'
diff --git a/hieradata/common/scap/master.yaml 
b/hieradata/common/scap/master.yaml
new file mode 100644
index 000..e7b1488
--- /dev/null
+++ b/hieradata/common/scap/master.yaml
@@ -0,0 +1,6 @@
+---
+common_path: '/srv/mediawiki'
+common_source_path: '/srv/mediawiki-staging'
+statsd_host: 'statsd.eqiad.wmnet'
+statsd_port: 8125
+deployment_group: 'wikidev'
diff --git a/hieradata/eqiad/scap/master.yaml b/hieradata/eqiad/scap/master.yaml
new file mode 100644
index 000..aa985e8
--- /dev/null
+++ b/hieradata/eqiad/scap/master.yaml
@@ -0,0 +1,2 @@
+---
+rsync_host: 'tin.eqiad.wmnet'
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index d5df4a3..9908040 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -2,12 +2,12 @@
 #
 # Sets up a scap master (currently tin)
 class scap::master(
-$common_path= '/srv/mediawiki',
-$common_source_path = '/srv/mediawiki-staging',
-$rsync_host = 'tin.eqiad.wmnet',
-$statsd_host= 'statsd.eqiad.wmnet',
-$statsd_port= 8125,
-$deployment_group   = 'wikidev',
+$common_path= undef,
+$common_source_path = undef,
+$rsync_host = undef,
+$statsd_host= undef,
+$statsd_port= undef,
+$deployment_group   = undef,
 ) {
 include scap::scripts
 include rsync::server

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f8a499022ea42d90f0da81919339d8903aa3c03
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add ebernhardson to researchers group - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Add ebernhardson to researchers group
..

Add ebernhardson to researchers group

Needed to access the research database.

Bug: T97332
Change-Id: I3e8086f9975bd09967abcf310685cf033ed3f40d
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/207133/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index bd2271c..29d69c1 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -98,7 +98,7 @@
   kleduc, leila, maryana, mattflaschen, milimetric, nettrom,
   nuria, ori, otto, qchris, springle, tnegrin, yurik, yuvipanda,
   mforns, erik, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal,
-  daisy, tomasz, mholloway-shell, madhuvishy]
+  daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson]
   ldap-admins:
 gid: 715
 description: ldap admins

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e8086f9975bd09967abcf310685cf033ed3f40d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] remove production tungsten dns - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: remove production tungsten dns
..

remove production tungsten dns

As the server is being reclaimed to the spares pool, remove
production dns entry of tungsten.eqiad.wmnet but leave the
mgmt interface in dns.

Bug: T97274
Change-Id: I408ee457ba9c68b7ee9b5086a2a5c8e2cd241897
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/36/207136/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 00d15f8..ab5668c 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -302,7 +302,7 @@
 14  1H IN PTR   db1010.eqiad.wmnet.
 15  1H IN PTR   db1011.eqiad.wmnet.
 17  1H IN PTR   rcs1002.eqiad.wmnet.
-18  1H IN PTR   tungsten.eqiad.wmnet.
+
 19  1H IN PTR   db1015.eqiad.wmnet.
 20  1H IN PTR   db1016.eqiad.wmnet.
 21  1H IN PTR   fluorine.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 1d13220..d16dec2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -206,7 +206,6 @@
 db1009  1H  IN A10.64.0.13
 db1010  1H  IN A10.64.0.14
 db1011  1H  IN A10.64.0.15
-tungsten1H  IN A10.64.0.18
 db1015  1H  IN A10.64.0.19
 db1016  1H  IN A10.64.0.20
 graphite10011H  IN A10.64.32.155

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I408ee457ba9c68b7ee9b5086a2a5c8e2cd241897
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] reclaim tungsten - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: reclaim tungsten
..

reclaim tungsten

remove tungsten from site.pp only as this will be reclaimed as a
spare. Leave the hardware ands netboot definitions.

Bug: T97274
Change-Id: I70217c7493dfd97f7e17387e503b30f80b1a4a94
---
M manifests/site.pp
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/207137/1

diff --git a/manifests/site.pp b/manifests/site.pp
index b02b8ce..a1ba618 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2340,11 +2340,6 @@
 role mediawiki::videoscaler
 }
 
-# old graphite host, waiting data backfill T90591
-node 'tungsten.eqiad.wmnet' {
-include standard
-}
-
 node 'uranium.wikimedia.org' {
 $ganglia_aggregator = true
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70217c7493dfd97f7e17387e503b30f80b1a4a94
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] add symlink species.org-wikimedia.com - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: add symlink species.org-wikimedia.com
..

add symlink species.org-wikimedia.com

species.org is owned by the WMF and the DNS is set to the relevant
nameservers. Redirects exist in apache for it however it doesn't
exist in DNS. Add a symnlink as with other domains.

Bug: T9495
Change-Id: Idbd2fe961ad5235321853c183bd8701d4861535d
---
A templates/wikispecies.org
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/49/207149/1

diff --git a/templates/wikispecies.org b/templates/wikispecies.org
new file mode 12
index 000..9ccc2ba
--- /dev/null
+++ b/templates/wikispecies.org
@@ -0,0 +1 @@
+wikimedia.com
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbd2fe961ad5235321853c183bd8701d4861535d
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] wmt: change tag name - change (labs...wikibugs2)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: wmt: change tag name
..

wmt: change tag name

Change-Id: I92b9360bf46c7cc3d49df8d8316ea71290bf5ff3
---
M channels.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/channels.yaml b/channels.yaml
index 5f555ad..7f03401 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -148,7 +148,7 @@
 - team-practices
 
 ##wmt:
-- Tool-Labs-tools-WMT-bots
+- WMT-bots
 
 #wikimedia-design:
 - Design

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92b9360bf46c7cc3d49df8d8316ea71290bf5ff3
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] codfw: add datacenter to dns config - change (operations/dns)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: codfw: add datacenter to dns config
..

codfw: add datacenter to dns config

Adds a codfw datacenter to the geo config and adds relevant PTR
records and service records into the relevant files.

The IPs copy how eqiad have them laid out as it seems both datacenters
will aspire to host the same services so keeping the same IP endings
may be suitable. Also based on existing comments about range allocation.

This is just a basic addition which adds everything necessary to
allow codfw into the dns scheme and can be modified to suit any needs
now (or later).

Change-Id: I6e2b4c740c7eeaee57450df3b5326ce88c95b700
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/153.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/44/203544/1

diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7fd41e6..ab6f314 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -139,16 +139,23 @@
 
 $ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
+1.0.0.0 1H IN PTR   text-lb.eqiad.wikimedia.org.
 e.0.0.0 1H IN PTR   ns1.wikimedia.org.
 
 ; LVS Mobile Zero  general support, 2620:0:860:ed1a::1:0/112
 
 $ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
+9.0.0.0 1H IN PTR   login-lb.eqiad.wikimedia.org.
+a.0.0.0 1H IN PTR   bits-lb.eqiad.wikimedia.org.
+c.0.0.0 1H IN PTR   mobile-lb.eqiad.wikimedia.org.
+
 ; LVS Multimedia, 2620:0:860:ed1a::2:0/112
 
 $ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
+b.0.0.0 1H IN PTR   upload-lb.eqiad.wikimedia.org.
+
 ; LVS Misc, 2620:0:860:ed1a::3:0/112
 
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index 73685c0..84bc704 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -104,11 +104,16 @@
 ; LVS out-of-subnet service IPs (208.80.153.224/27)
 
 ; Desktop Text  Assets  208.80.153.224 - .231 (208.80.153.224/29)
+224 1H  IN PTR  text-lb.codfw.wikimedia.org.
 231 1H  IN PTR  ns1.wikimedia.org.
 
 ; Mobile Zero  general Support 208.80.153.232 - .239 (208.80.153.232/29)
+233 1H  IN PTR  login-lb.codfw.wikimedia.org.
+234 1H  IN PTR  bits-lb.codfw.wikimedia.org.
+236 1H  IN PTR  mobile-lb.codfw.wikimedia.org.
 
 ; Multimedia 208.80.153.240 - .247 (208.80.153.240/29)
+240 1H  IN PTR  upload-lb.codfw.wikimedia.org.
 
 ; Misc 208.80.153.248 - .255 (208.80.153.248/29)
 254  1H  IN PTR dns-rec-lb.codfw.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 3c4a15a..7dc9e46 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -261,6 +261,12 @@
 ;;; codfw
 dns-rec-lb.codfw1H  IN A208.80.153.254
 1H  IN  2620:0:860:ed1a::3:fe
+text-lb.codfw   600 IN DYNA geoip!text-addrs/codfw
+login-lb.codfw  600 IN DYNA geoip!login-addrs/codfw
+bits-lb.codfw   600 IN DYNA geoip!bits-addrs/codfw
+upload-lb.codfw 600 IN DYNA geoip!upload-addrs/codfw
+mobile-lb.codfw 600 IN DYNA geoip!mobile-addrs/codfw
+donate-lb.codfw 600 IN DYNA geoip!text-addrs-v4/codfw
 
 ; Mobile
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e2b4c740c7eeaee57450df3b5326ce88c95b700
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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

[MediaWiki-commits] [Gerrit] Increase I/O values for mailman check - change (operations/puppet)

[John F. Lewis (Code Review)]

John F. Lewis has uploaded a new change for review.

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

Change subject: Increase I/O values for mailman check
..

Increase I/O values for mailman check

Current values produce a lot of warnings and criticals
very often. As these were added based on a days check,
add new values which are just above sodium's average
and see if this reduces the clutter.

Could do with more fine-tuning and perhaps being checked
for accuracy/performance but this should be good for now.

Change-Id: I86a96e52d9c539be9df5ecc4f23d92adc34a5ed7
---
M manifests/role/mail.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/202648/1

diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 5f8d77b..8bd75f1 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -184,9 +184,10 @@
 source = 'puppet:///files/icinga/check_iostat',
 }
 
+# values chosen based on i/o averages for sodium
 nrpe::monitor_service { 'mailman_iostat':
 description   = 'mailman I/O stats',
-nrpe_command  = '/usr/local/lib/nagios/plugins/check_iostat -i -w 
150,10,200,100,5000 -c 300,20,400,200,1',
+nrpe_command  = '/usr/local/lib/nagios/plugins/check_iostat -i -w 
250,40,300,200,5500 -c 500,80,600,400,11000',
 timeout   = '30',
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86a96e52d9c539be9df5ecc4f23d92adc34a5ed7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com

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