[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster::web_frontend: use ssldir in the vhost too

2016-09-14 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: puppetmaster::web_frontend: use ssldir in the vhost too
..


puppetmaster::web_frontend: use ssldir in the vhost too

Change-Id: If41cfbbcda2937eb98f3aed805fc66390ff74def
---
M modules/puppetmaster/templates/web-frontend.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/puppetmaster/templates/web-frontend.conf.erb 
b/modules/puppetmaster/templates/web-frontend.conf.erb
index 4f20a55..71e27f8 100644
--- a/modules/puppetmaster/templates/web-frontend.conf.erb
+++ b/modules/puppetmaster/templates/web-frontend.conf.erb
@@ -4,8 +4,8 @@
 <%- if @alt_names %>ServerAlias <%= @alt_names.sort.join(" ") %><% end %>
 SSLEngine on
 <%= @ssl_settings.join("\n") %>
-SSLCertificateFile  /var/lib/puppet/ssl/certs/<%= @server_name %>.pem
-SSLCertificateKeyFile   /var/lib/puppet/ssl/private_keys/<%= @server_name 
%>.pem
+SSLCertificateFile  <%= @ssldir %>/certs/<%= @server_name %>.pem
+SSLCertificateKeyFile   <%= @ssldir %>/private_keys/<%= @server_name %>.pem
 SSLCACertificateFile/var/lib/puppet/ssl/certs/ca.pem
 SSLCertificateChainFile /var/lib/puppet/ssl/certs/ca.pem
 # If Apache complains about invalid signatures on the CRL, you can try 
disabling

-- 
To view, visit https://gerrit.wikimedia.org/r/310521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If41cfbbcda2937eb98f3aed805fc66390ff74def
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster::web_frontend: use ssldir in the vhost too

2016-09-14 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310521

Change subject: puppetmaster::web_frontend: use ssldir in the vhost too
..

puppetmaster::web_frontend: use ssldir in the vhost too

Change-Id: If41cfbbcda2937eb98f3aed805fc66390ff74def
---
M modules/puppetmaster/templates/web-frontend.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/310521/1

diff --git a/modules/puppetmaster/templates/web-frontend.conf.erb 
b/modules/puppetmaster/templates/web-frontend.conf.erb
index 4f20a55..71e27f8 100644
--- a/modules/puppetmaster/templates/web-frontend.conf.erb
+++ b/modules/puppetmaster/templates/web-frontend.conf.erb
@@ -4,8 +4,8 @@
 <%- if @alt_names %>ServerAlias <%= @alt_names.sort.join(" ") %><% end %>
 SSLEngine on
 <%= @ssl_settings.join("\n") %>
-SSLCertificateFile  /var/lib/puppet/ssl/certs/<%= @server_name %>.pem
-SSLCertificateKeyFile   /var/lib/puppet/ssl/private_keys/<%= @server_name 
%>.pem
+SSLCertificateFile  <%= @ssldir %>/certs/<%= @server_name %>.pem
+SSLCertificateKeyFile   <%= @ssldir %>/private_keys/<%= @server_name %>.pem
 SSLCACertificateFile/var/lib/puppet/ssl/certs/ca.pem
 SSLCertificateChainFile /var/lib/puppet/ssl/certs/ca.pem
 # If Apache complains about invalid signatures on the CRL, you can try 
disabling

-- 
To view, visit https://gerrit.wikimedia.org/r/310521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If41cfbbcda2937eb98f3aed805fc66390ff74def
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits