Akosiaris has submitted this change and it was merged.
Change subject: Selectively enable SSL on dynamicproxy via a class param
......................................................................
Selectively enable SSL on dynamicproxy via a class param
Change-Id: I46effb9e93c78ee66b9d05698357f38b13ea1b02
---
M modules/dynamicproxy/manifests/init.pp
M modules/dynamicproxy/templates/proxy.conf
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dynamicproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
index 7bc5e8b..2269f44 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -1,6 +1,6 @@
class dynamicproxy (
$redis_maxmemory="512MB",
- $ssl_certificate_name
+ $ssl_certificate_name=false
) {
class { '::redis':
persist => "aof",
diff --git a/modules/dynamicproxy/templates/proxy.conf
b/modules/dynamicproxy/templates/proxy.conf
index 244d3e4..bd274b9 100644
--- a/modules/dynamicproxy/templates/proxy.conf
+++ b/modules/dynamicproxy/templates/proxy.conf
@@ -8,8 +8,10 @@
server {
resolver 10.4.0.1;
- # Serve both HTTP and HTTPS
listen 80;
+
+ <%- if @ssl_certificate_name != false -%>
+ # Serve both HTTP and HTTPS
listen 443 default_server ssl;
ssl_certificate /etc/ssl/certs/<%= @ssl_certificate_name %>.pem;
@@ -26,6 +28,7 @@
ssl_ciphers AES128-GCM-SHA256:RC4-SHA:RC4-MD5:AES128-SHA:AES256-SHA;
# Prefer server ciphers (Prefer RC4 first to combat BEAST)
ssl_prefer_server_ciphers on;
+ <%- end -%>
location / {
set $backend '';
--
To view, visit https://gerrit.wikimedia.org/r/84215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46effb9e93c78ee66b9d05698357f38b13ea1b02
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
