Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216652
Change subject: mail: rename role::mail::lists to role::lists
......................................................................
mail: rename role::mail::lists to role::lists
role::mail::* got too big and the role class for lists is really more of
a service, not a mail server setup. Give it its own role class
hierarchy.
Change-Id: I6caebb6256198eb18bc864df467676e7652b9e01
---
A manifests/role/lists.pp
M manifests/role/mail.pp
M manifests/site.pp
3 files changed, 140 insertions(+), 141 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/216652/1
diff --git a/manifests/role/lists.pp b/manifests/role/lists.pp
new file mode 100644
index 0000000..4e12147
--- /dev/null
+++ b/manifests/role/lists.pp
@@ -0,0 +1,139 @@
+class role::lists {
+ include network::constants
+
+ system::role { 'role::mail::lists':
+ description => 'Mailing list server',
+ }
+
+ mailalias { 'root':
+ recipient => 'r...@wikimedia.org',
+ }
+
+ interface::ip { 'lists.wikimedia.org_v4':
+ interface => 'eth0',
+ address => '208.80.154.4',
+ prefixlen => '32',
+ }
+
+ interface::ip { 'lists.wikimedia.org_v6':
+ interface => 'eth0',
+ address => '2620:0:861:1::2',
+ 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'
+ ]
+
+ install_certificate{ 'lists.wikimedia.org': }
+
+ include mailman
+
+ class { 'spamassassin':
+ required_score => '4.0',
+ use_bayes => '0',
+ bayes_auto_learn => '0',
+ trusted_networks => $network::constants::all_networks,
+ }
+
+ include privateexim::listserve
+
+ class { 'exim4':
+ variant => 'heavy',
+ config => template('exim/exim4.conf.mailman.erb'),
+ filter => template('exim/system_filter.conf.mailman.erb'),
+ require => [
+ Class['spamassassin'],
+ Interface::Ip['lists.wikimedia.org_v4'],
+ Interface::Ip['lists.wikimedia.org_v6'],
+ ],
+ }
+ include exim4::ganglia
+
+ file { '/etc/exim4/aliases/lists.wikimedia.org':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///files/exim/listserver_aliases',
+ require => Class['exim4'],
+ }
+
+ exim4::dkim { 'lists.wikimedia.org':
+ domain => 'lists.wikimedia.org',
+ selector => 'wikimedia',
+ source => 'puppet:///private/dkim/lists.wikimedia.org-wikimedia.key',
+ }
+
+ include role::backup::host
+ backup::set { 'var-lib-mailman': }
+
+ monitoring::service { 'smtp':
+ description => 'Exim SMTP',
+ check_command => 'check_smtp',
+ }
+
+ monitoring::service { 'https':
+ description => 'HTTPS',
+ check_command => 'check_ssl_http!lists.wikimedia.org',
+ }
+
+ nrpe::monitor_service { 'procs_mailmanctl':
+ description => 'mailman_ctl',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -u list
--ereg-argument-array=\'/mailman/bin/mailmanctl\''
+ }
+
+ nrpe::monitor_service { 'procs_mailman_qrunner':
+ description => 'mailman_qrunner',
+ nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 8:8 -u list
--ereg-argument-array=\'/mailman/bin/qrunner\''
+ }
+
+ monitoring::service { 'mailman_listinfo':
+ description => 'mailman list info',
+ check_command =>
'check_https_url_for_string!lists.wikimedia.org!/mailman/listinfo/wikimedia-l!\'Discussion
list for the Wikimedia community\'',
+ }
+
+ monitoring::service { 'mailman_archives':
+ description => 'mailman archives',
+ check_command =>
'check_https_url_for_string!lists.wikimedia.org!/pipermail/wikimedia-l/!\'The
Wikimedia-l Archives\'',
+ }
+
+ file { '/usr/local/lib/nagios/plugins/check_mailman_queue':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ source => 'puppet:///files/icinga/check_mailman_queue',
+ }
+
+ nrpe::monitor_service { 'mailman_queue':
+ description => 'mailman_queue_size',
+ nrpe_command => '/usr/local/lib/nagios/plugins/check_mailman_queue
42',
+ }
+
+ # on list servers we monitor I/O with iostat
+ # the icinga plugin needs bc to compare floating point numbers
+ package { 'bc':
+ ensure => present,
+ }
+
+ file { '/usr/local/lib/nagios/plugins/check_iostat':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ 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
250,350,300,14000,7500 -c 500,400,600,28000,11000',
+ timeout => '30',
+ }
+
+}
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 82ccdcf..e1eb9b5 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -95,143 +95,3 @@
command => "/usr/bin/mail -s '${subject}' ${recipient} < ${alias_file}
>/dev/null 2>&1",
}
}
-
-class role::mail::lists {
- include network::constants
-
- system::role { 'role::mail::lists':
- description => 'Mailing list server',
- }
-
- mailalias { 'root':
- recipient => 'r...@wikimedia.org',
- }
-
- interface::ip { 'lists.wikimedia.org_v4':
- interface => 'eth0',
- address => '208.80.154.4',
- prefixlen => '32',
- }
-
- interface::ip { 'lists.wikimedia.org_v6':
- interface => 'eth0',
- address => '2620:0:861:1::2',
- 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'
- ]
-
- install_certificate{ 'lists.wikimedia.org': }
-
- include mailman
-
- class { 'spamassassin':
- required_score => '4.0',
- use_bayes => '0',
- bayes_auto_learn => '0',
- trusted_networks => $network::constants::all_networks,
- }
-
- include privateexim::listserve
-
- class { 'exim4':
- variant => 'heavy',
- config => template('exim/exim4.conf.mailman.erb'),
- filter => template('exim/system_filter.conf.mailman.erb'),
- require => [
- Class['spamassassin'],
- Interface::Ip['lists.wikimedia.org_v4'],
- Interface::Ip['lists.wikimedia.org_v6'],
- ],
- }
- include exim4::ganglia
-
- file { '/etc/exim4/aliases/lists.wikimedia.org':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/exim/listserver_aliases',
- require => Class['exim4'],
- }
-
- exim4::dkim { 'lists.wikimedia.org':
- domain => 'lists.wikimedia.org',
- selector => 'wikimedia',
- source => 'puppet:///private/dkim/lists.wikimedia.org-wikimedia.key',
- }
-
- include role::backup::host
- backup::set { 'var-lib-mailman': }
-
- monitoring::service { 'smtp':
- description => 'Exim SMTP',
- check_command => 'check_smtp',
- }
-
- monitoring::service { 'https':
- description => 'HTTPS',
- check_command => 'check_ssl_http!lists.wikimedia.org',
- }
-
- nrpe::monitor_service { 'procs_mailmanctl':
- description => 'mailman_ctl',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 1:1 -u list
--ereg-argument-array=\'/mailman/bin/mailmanctl\''
- }
-
- nrpe::monitor_service { 'procs_mailman_qrunner':
- description => 'mailman_qrunner',
- nrpe_command => '/usr/lib/nagios/plugins/check_procs -c 8:8 -u list
--ereg-argument-array=\'/mailman/bin/qrunner\''
- }
-
- monitoring::service { 'mailman_listinfo':
- description => 'mailman list info',
- check_command =>
'check_https_url_for_string!lists.wikimedia.org!/mailman/listinfo/wikimedia-l!\'Discussion
list for the Wikimedia community\'',
- }
-
- monitoring::service { 'mailman_archives':
- description => 'mailman archives',
- check_command =>
'check_https_url_for_string!lists.wikimedia.org!/pipermail/wikimedia-l/!\'The
Wikimedia-l Archives\'',
- }
-
- file { '/usr/local/lib/nagios/plugins/check_mailman_queue':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0755',
- source => 'puppet:///files/icinga/check_mailman_queue',
- }
-
- nrpe::monitor_service { 'mailman_queue':
- description => 'mailman_queue_size',
- nrpe_command => '/usr/local/lib/nagios/plugins/check_mailman_queue
42',
- }
-
- # on list servers we monitor I/O with iostat
- # the icinga plugin needs bc to compare floating point numbers
- package { 'bc':
- ensure => present,
- }
-
- file { '/usr/local/lib/nagios/plugins/check_iostat':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0755',
- 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
250,350,300,14000,7500 -c 500,400,600,28000,11000',
- timeout => '30',
- }
-
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index b56d30d..4f842c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2232,7 +2232,7 @@
}
node 'sodium.wikimedia.org' {
- role mail::lists
+ role lists
include standard
interface::add_ip6_mapped { 'main':
--
To view, visit https://gerrit.wikimedia.org/r/216652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6caebb6256198eb18bc864df467676e7652b9e01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
