Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365053 )
Change subject: Puppetmaster: Fix apache config ssldir
......................................................................
Puppetmaster: Fix apache config ssldir
In an earlier change we moved the puppetmaster's ssl dir
to /var/lib/puppet/server/ssl. Since Apache uses the
same certs, it should also point to /var/lib/puppet/server/ssl
instead of /var/lib/puppet/ssl.
As far as I can tell this was only working because no one had
tried this code path before.
Change-Id: Idafc5b08b811750c310499925d484f06a347142c
---
M modules/puppetmaster/templates/web-frontend.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/templates/web-frontend.conf.erb
b/modules/puppetmaster/templates/web-frontend.conf.erb
index 98dd85e..35fcecf 100644
--- a/modules/puppetmaster/templates/web-frontend.conf.erb
+++ b/modules/puppetmaster/templates/web-frontend.conf.erb
@@ -6,8 +6,8 @@
<%= @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
- SSLCertificateChainFile /var/lib/puppet/ssl/certs/ca.pem
+ SSLCACertificateFile /var/lib/puppet/server/ssl/certs/ca.pem
+ SSLCertificateChainFile /var/lib/puppet/server/ssl/certs/ca.pem
# If Apache complains about invalid signatures on the CRL, you can try
disabling
# CRL checking by commenting the next line, but this is not recommended.
# NOTE: https://tickets.puppetlabs.com/browse/PUP-2310 says that CRL is
not updated. Need to reevaluate this
--
To view, visit https://gerrit.wikimedia.org/r/365053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idafc5b08b811750c310499925d484f06a347142c
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
