Dzahn has submitted this change and it was merged.
Change subject: dumps: move ssl cert and config to role
......................................................................
dumps: move ssl cert and config to role
Both the ssl cert install and the config settings
should be in the role, in one place along with
the ssl cert monitoring from Iac6b7533e8766.
Change-Id: I806cfc76825732398fa4964e33ed7b5d988e2766
---
M manifests/role/dumps.pp
M modules/dumps/manifests/init.pp
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/dumps.pp b/manifests/role/dumps.pp
index 2497b4d..b1ae028 100644
--- a/manifests/role/dumps.pp
+++ b/manifests/role/dumps.pp
@@ -15,6 +15,10 @@
check_command => 'check_ssl_http!dumps.wikimedia.org',
}
+ sslcert::certificate { 'dumps.wikimedia.org': }
+
+ $ssl_settings = ssl_ciphersuite('nginx', 'compat')
+
# By default the resolve() function in ferm performs only an IPv4/A DNS
# lookup. It fails if a host only has an IPv6 address. Ferm also provides
# a AAAA lookup mode for IPv6 addresses, but this equally fails if only
diff --git a/modules/dumps/manifests/init.pp b/modules/dumps/manifests/init.pp
index 7fd0886..e6f0fbe 100644
--- a/modules/dumps/manifests/init.pp
+++ b/modules/dumps/manifests/init.pp
@@ -1,11 +1,8 @@
class dumps {
- sslcert::certificate { 'dumps.wikimedia.org': }
class { '::nginx':
variant => 'extras',
}
-
- $ssl_settings = ssl_ciphersuite('nginx', 'compat')
nginx::site { 'dumps':
content => template('dumps/nginx.dumps.conf.erb'),
--
To view, visit https://gerrit.wikimedia.org/r/247700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I806cfc76825732398fa4964e33ed7b5d988e2766
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: John F. Lewis <johnflewi...@gmail.com>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
