Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/329745 )
Change subject: puppetmaster: Indent @ssl_settings in Apache and NGINX
configurations
......................................................................
puppetmaster: Indent @ssl_settings in Apache and NGINX configurations
Change-Id: I55497a5b54faab8326735a8069a0360dbf8d52b8
---
M modules/puppetmaster/templates/nginx-puppetdb.conf.erb
M modules/puppetmaster/templates/puppetmaster-backend.conf.erb
M modules/puppetmaster/templates/puppetmaster.erb
M modules/puppetmaster/templates/web-frontend.conf.erb
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/329745/1
diff --git a/modules/puppetmaster/templates/nginx-puppetdb.conf.erb
b/modules/puppetmaster/templates/nginx-puppetdb.conf.erb
index 450eed5..58b54f1 100644
--- a/modules/puppetmaster/templates/nginx-puppetdb.conf.erb
+++ b/modules/puppetmaster/templates/nginx-puppetdb.conf.erb
@@ -9,7 +9,7 @@
ssl_certificate_key /etc/nginx/ssl/server.key;
ssl_session_cache shared:SSL:50m;
ssl_session_timeout 5m;
- <%= @ssl_settings.join("\n") %>
+ <%= @ssl_settings.join("\n ") %>
access_log /var/log/nginx/puppetdb_access.log;
error_log /var/log/nginx/puppetdb_error.log;
diff --git a/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
b/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
index 9b0f8e0..832c5cf 100644
--- a/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
+++ b/modules/puppetmaster/templates/puppetmaster-backend.conf.erb
@@ -2,7 +2,7 @@
<VirtualHost <%= @bind_address %>:8141>
SSLEngine on
- <%= @ssl_settings.join("\n") %>
+ <%= @ssl_settings.join("\n ") %>
SSLCertificateFile /var/lib/puppet/ssl/certs/<%= @fqdn %>.pem
SSLCertificateKeyFile /var/lib/puppet/ssl/private_keys/<%= @fqdn %>.pem
diff --git a/modules/puppetmaster/templates/puppetmaster.erb
b/modules/puppetmaster/templates/puppetmaster.erb
index fd5f5c8..39ab649 100644
--- a/modules/puppetmaster/templates/puppetmaster.erb
+++ b/modules/puppetmaster/templates/puppetmaster.erb
@@ -2,7 +2,7 @@
<VirtualHost <%= scope.lookupvar('puppetmaster::passenger::bind_address')
%>:8140>
SSLEngine on
- <%= @ssl_settings.join("\n") %>
+ <%= @ssl_settings.join("\n ") %>
SSLCertificateFile /var/lib/puppet/server/ssl/certs/<%=
scope.lookupvar('puppetmaster::server_name') %>.pem
SSLCertificateKeyFile /var/lib/puppet/server/ssl/private_keys/<%=
scope.lookupvar('puppetmaster::server_name') %>.pem
SSLCACertificateFile /var/lib/puppet/server/ssl/ca/ca_crt.pem
diff --git a/modules/puppetmaster/templates/web-frontend.conf.erb
b/modules/puppetmaster/templates/web-frontend.conf.erb
index 324fdb8..1ece9cd 100644
--- a/modules/puppetmaster/templates/web-frontend.conf.erb
+++ b/modules/puppetmaster/templates/web-frontend.conf.erb
@@ -3,7 +3,7 @@
ServerName <%= @server_name %>
<%- if @alt_names %> ServerAlias <%= @alt_names.sort.join(" ") %><% end %>
SSLEngine on
- <%= @ssl_settings.join("\n") %>
+ <%= @ssl_settings.join("\n ") %>
SSLCertificateFile <%= @ssldir %>/certs/<%= @server_name %>.pem
SSLCertificateKeyFile <%= @ssldir %>/private_keys/<%= @server_name %>.pem
SSLCACertificateFile /var/lib/puppet/ssl/certs/ca.pem
--
To view, visit https://gerrit.wikimedia.org/r/329745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55497a5b54faab8326735a8069a0360dbf8d52b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
