Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329750 )
Change subject: dynamicproxy: Indent @ssl_settings in NGINX configurations
......................................................................
dynamicproxy: Indent @ssl_settings in NGINX configurations
Change-Id: I7f3907c09b33f66ebe5d1e6122a9c09ff0abd5e4
---
M modules/dynamicproxy/templates/domainproxy.conf
M modules/dynamicproxy/templates/urlproxy.conf
M modules/role/templates/labs/novaproxy-wmflabs.org.conf
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/dynamicproxy/templates/domainproxy.conf
b/modules/dynamicproxy/templates/domainproxy.conf
index a220a91..9103618 100644
--- a/modules/dynamicproxy/templates/domainproxy.conf
+++ b/modules/dynamicproxy/templates/domainproxy.conf
@@ -44,7 +44,7 @@
ssl_session_cache shared:SSL:50m;
ssl_session_timeout 5m;
- <%= @ssl_settings.join("\n") %>
+ <%= @ssl_settings.join("\n ") %>
<%- end -%>
diff --git a/modules/dynamicproxy/templates/urlproxy.conf
b/modules/dynamicproxy/templates/urlproxy.conf
index 5aa24c3..0a2877c 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -55,7 +55,7 @@
ssl_session_cache shared:SSL:50m;
ssl_session_timeout 5m;
- <%= @ssl_settings.join("\n") %>
+ <%= @ssl_settings.join("\n ") %>
<%- end -%>
diff --git a/modules/role/templates/labs/novaproxy-wmflabs.org.conf
b/modules/role/templates/labs/novaproxy-wmflabs.org.conf
index 75ba2ab..0f6feff 100644
--- a/modules/role/templates/labs/novaproxy-wmflabs.org.conf
+++ b/modules/role/templates/labs/novaproxy-wmflabs.org.conf
@@ -24,7 +24,7 @@
ssl_certificate /etc/ssl/localcerts/star.wmflabs.org.chained.crt;
ssl_certificate_key /etc/ssl/private/star.wmflabs.org.key;
- <%= @ssl_settings.join("\n") %>
+ <%= @ssl_settings.join("\n ") %>
listen 80;
--
To view, visit https://gerrit.wikimedia.org/r/329750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f3907c09b33f66ebe5d1e6122a9c09ff0abd5e4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
