Herron has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/389791 )
Change subject: Revert "Puppet: Change hostcert and remove hostprivkey master settings" ...................................................................... Revert "Puppet: Change hostcert and remove hostprivkey master settings" This reverts commit fbdeade90a611da56af4227efbdaf9cf8c734385. Change-Id: I43969da834409ac3349d13789b908c5dd7647e7f --- M modules/puppetmaster/templates/master.conf.erb 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Herron: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/puppetmaster/templates/master.conf.erb b/modules/puppetmaster/templates/master.conf.erb index 700e3d9..5a16a6d 100644 --- a/modules/puppetmaster/templates/master.conf.erb +++ b/modules/puppetmaster/templates/master.conf.erb @@ -18,4 +18,5 @@ ssl_client_header = SSL_CLIENT_S_DN ssl_client_verify_header = SSL_CLIENT_VERIFY <%- end -%> -hostcert = /var/lib/puppet/ssl/certs/<%= @fqdn %>.pem +hostcert = /var/lib/puppet/server/ssl/certs/<%= @fqdn %>.pem +hostprivkey = /var/lib/puppet/server/ssl/private_keys/<%= @fqdn %>.pem -- To view, visit https://gerrit.wikimedia.org/r/389791 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43969da834409ac3349d13789b908c5dd7647e7f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Herron <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Herron <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
