Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346923 )
Change subject: lists: convert to role/profile structure
......................................................................
lists: convert to role/profile structure
Change-Id: Ifdffd277d091b31f500084dfb3037e159b2b5ddd
---
R hieradata/role/common/lists.yaml
M manifests/site.pp
R modules/profile/files/exim/listserver_aliases
R modules/profile/manifests/lists.pp
R modules/profile/templates/exim/exim4.conf.mailman.erb
R modules/profile/templates/exim/system_filter.conf.mailman.erb
A modules/role/manifests/lists.pp
7 files changed, 25 insertions(+), 24 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/lists/server.yaml
b/hieradata/role/common/lists.yaml
similarity index 100%
rename from hieradata/role/common/lists/server.yaml
rename to hieradata/role/common/lists.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 3f8265a..0876d1f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1083,8 +1083,7 @@
# virtual machine for mailman list server
node 'fermium.wikimedia.org' {
- role(lists::server)
- interface::add_ip6_mapped { 'main': interface => 'eth0' }
+ role(lists)
}
# ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)
diff --git a/modules/role/files/exim/listserver_aliases
b/modules/profile/files/exim/listserver_aliases
similarity index 100%
rename from modules/role/files/exim/listserver_aliases
rename to modules/profile/files/exim/listserver_aliases
diff --git a/modules/role/manifests/lists/server.pp
b/modules/profile/manifests/lists.pp
similarity index 86%
rename from modules/role/manifests/lists/server.pp
rename to modules/profile/manifests/lists.pp
index 62a5377..a89c616 100644
--- a/modules/role/manifests/lists/server.pp
+++ b/modules/profile/manifests/lists.pp
@@ -1,17 +1,19 @@
-class role::lists::server {
- include network::constants
+class profile::lists (
+ $outbound_ips = hiera_array('mailman::server_ip'),
+ $list_outbound_ips = hiera_array('mailman::lists_ip'),
+) {
+
include ::base::firewall
- include ::standard
+ include ::network::constants
+ include ::mailman
+ include ::privateexim::listserve
+ include ::exim4::ganglia
- system::role { 'role::lists::server':
- description => 'Mailing list server',
- }
-
- mailalias { 'root':
- recipient => '[email protected]',
- }
+ mailalias { 'root': recipient => '[email protected]' }
$lists_ip = hiera('mailman::lists_ip')
+
+ interface::add_ip6_mapped { 'main': interface => 'eth0' }
interface::ip { 'lists.wikimedia.org_v4':
interface => 'eth0',
@@ -25,17 +27,12 @@
prefixlen => '128',
}
- $outbound_ips = hiera_array('mailman::server_ip')
- $list_outbound_ips = hiera_array('mailman::lists_ip')
-
letsencrypt::cert::integrated { 'lists':
subjects => 'lists.wikimedia.org',
puppet_svc => 'apache2',
system_svc => 'apache2',
key_group => 'Debian-exim',
}
-
- include mailman
class { 'spamassassin':
required_score => '4.0',
@@ -44,25 +41,22 @@
trusted_networks => $network::constants::all_networks,
}
- include privateexim::listserve
-
class { 'exim4':
variant => 'heavy',
- config => template('role/exim/exim4.conf.mailman.erb'),
- filter => template('role/exim/system_filter.conf.mailman.erb'),
+ config => template('profile/exim/exim4.conf.mailman.erb'),
+ filter => template('profile/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:///modules/role/exim/listserver_aliases',
+ source => 'puppet:///modules/profile/exim/listserver_aliases',
require => Class['exim4'],
}
@@ -72,7 +66,6 @@
content => secret('dkim/lists.wikimedia.org-wikimedia.key'),
}
- include ::profile::backup::host
backup::set { 'var-lib-mailman': }
monitoring::service { 'smtp':
diff --git a/modules/role/templates/exim/exim4.conf.mailman.erb
b/modules/profile/templates/exim/exim4.conf.mailman.erb
similarity index 100%
rename from modules/role/templates/exim/exim4.conf.mailman.erb
rename to modules/profile/templates/exim/exim4.conf.mailman.erb
diff --git a/modules/role/templates/exim/system_filter.conf.mailman.erb
b/modules/profile/templates/exim/system_filter.conf.mailman.erb
similarity index 100%
rename from modules/role/templates/exim/system_filter.conf.mailman.erb
rename to modules/profile/templates/exim/system_filter.conf.mailman.erb
diff --git a/modules/role/manifests/lists.pp b/modules/role/manifests/lists.pp
new file mode 100644
index 0000000..c4d6566
--- /dev/null
+++ b/modules/role/manifests/lists.pp
@@ -0,0 +1,9 @@
+# sets up a mailing list server
+class role::lists {
+
+ system::role { 'role::lists': description => 'Mailing list server', }
+
+ include ::standard
+ include ::profile::backup::host
+ include ::profile::lists
+}
--
To view, visit https://gerrit.wikimedia.org/r/346923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdffd277d091b31f500084dfb3037e159b2b5ddd
Gerrit-PatchSet: 12
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
