Dzahn has submitted this change and it was merged.
Change subject: Revert "dumps: move ssl cert and config to role"
......................................................................
Revert "dumps: move ssl cert and config to role"
This reverts commit 2c9bd314ee4838153c97446fad11191c25042748.
Change-Id: I42c79f6c802d220c74e85f8c33b54d7bccce014e
---
M manifests/role/dumps.pp
M modules/dumps/manifests/init.pp
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/dumps.pp b/manifests/role/dumps.pp
index b1ae028..2497b4d 100644
--- a/manifests/role/dumps.pp
+++ b/manifests/role/dumps.pp
@@ -15,10 +15,6 @@
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 e6f0fbe..7fd0886 100644
--- a/modules/dumps/manifests/init.pp
+++ b/modules/dumps/manifests/init.pp
@@ -1,9 +1,12 @@
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'),
notify => Service['nginx'],
--
To view, visit https://gerrit.wikimedia.org/r/248081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42c79f6c802d220c74e85f8c33b54d7bccce014e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
