Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346923 )
Change subject: lists: convert to role/profile structure
......................................................................
lists: convert to role/profile structure
Change-Id: Ifdffd277d091b31f500084dfb3037e159b2b5ddd
---
M manifests/site.pp
R modules/profile/manifests/lists/server.pp
A modules/role/manifests/lists_server.pp
3 files changed, 20 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/346923/1
diff --git a/manifests/site.pp b/manifests/site.pp
index a7a729d..06fe4ac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1075,8 +1075,7 @@
# virtual machine for mailman list server
node 'fermium.wikimedia.org' {
- role(lists::server)
- interface::add_ip6_mapped { 'main': interface => 'eth0' }
+ role(lists_server)
}
# ZIM dumps (https://en.wikipedia.org/wiki/ZIM_%28file_format%29)
diff --git a/modules/role/manifests/lists/server.pp
b/modules/profile/manifests/lists/server.pp
similarity index 89%
rename from modules/role/manifests/lists/server.pp
rename to modules/profile/manifests/lists/server.pp
index 956c346..be9f7f7 100644
--- a/modules/role/manifests/lists/server.pp
+++ b/modules/profile/manifests/lists/server.pp
@@ -1,17 +1,12 @@
-class role::lists::server {
- include network::constants
- include ::base::firewall
- include ::standard
+class profile::lists_server (
+ $outbound_ips = hiera_array('mailman::server_ip'),
+ $list_outbound_ips = hiera_array('mailman::lists_ip'),
+) {
- 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,9 +20,6 @@
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',
@@ -35,16 +27,12 @@
key_group => 'Debian-exim',
}
- 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',
@@ -56,7 +44,6 @@
Interface::Ip['lists.wikimedia.org_v6'],
],
}
- include exim4::ganglia
file { '/etc/exim4/aliases/lists.wikimedia.org':
owner => 'root',
@@ -72,7 +59,6 @@
content => secret('dkim/lists.wikimedia.org-wikimedia.key'),
}
- include ::role::backup::host
backup::set { 'var-lib-mailman': }
monitoring::service { 'smtp':
diff --git a/modules/role/manifests/lists_server.pp
b/modules/role/manifests/lists_server.pp
new file mode 100644
index 0000000..5cba141
--- /dev/null
+++ b/modules/role/manifests/lists_server.pp
@@ -0,0 +1,13 @@
+# sets up a mailing list server
+class role::lists_server {
+
+ system::role { 'role::lists_server': description => 'Mailing list server',
}
+
+ include ::network::constants
+ include ::standard
+ include ::mailman
+ include ::privateexim::listserve
+ include ::exim4::ganglia
+ include ::role::backup::host
+ include ::role::lists::server
+}
--
To view, visit https://gerrit.wikimedia.org/r/346923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdffd277d091b31f500084dfb3037e159b2b5ddd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
