Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394624 )
Change subject: diadem/dysprosium: introduce skeleton role
......................................................................
diadem/dysprosium: introduce skeleton role
Start a (placeholder) role, move includes out of site.pp.
Add some comments what these hosts are for.
wmf-style: total violations delta -2
Bug: T169566
Change-Id: I67cb446ce04a0148ed0ddb9b880bcb0fcab719cb
---
M manifests/site.pp
A modules/role/manifests/dmarc.pp
2 files changed, 15 insertions(+), 2 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/manifests/site.pp b/manifests/site.pp
index ae7e337..2df12b8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -284,9 +284,9 @@
role(docker::registry)
}
+# DMARC processing (T169566)
node /^(diadem|dysprosium)\.wikimedia\.org$/ {
- include ::standard
- include ::base::firewall
+ role(dmarc)
}
node 'dataset1001.wikimedia.org' {
diff --git a/modules/role/manifests/dmarc.pp b/modules/role/manifests/dmarc.pp
new file mode 100644
index 0000000..6668bf1
--- /dev/null
+++ b/modules/role/manifests/dmarc.pp
@@ -0,0 +1,13 @@
+# == Class: role::dmarc
+#
+# Sets up servers for DMARC processing
+#
+class role::dmarc {
+
+ include ::standard
+ include ::profile::base::firewall
+
+ system::role { 'dmarc':
+ description => 'DMARC processing server',
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/394624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67cb446ce04a0148ed0ddb9b880bcb0fcab719cb
Gerrit-PatchSet: 3
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: Herron <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
