Faidon Liambotis has submitted this change and it was merged. Change subject: puppet.conf: remove obsolete ca_md setting ......................................................................
puppet.conf: remove obsolete ca_md setting This setting never had any effect, and has been removed upstream: https://github.com/puppetlabs/puppet/pull/1390 Change-Id: If95dfce645d9ab0bf28adb4fea946995623e69fe --- M modules/puppet/templates/self.conf.erb M modules/puppetmaster/templates/master.conf.erb 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, but someone else must approve Faidon Liambotis: Verified; Looks good to me, approved diff --git a/modules/puppet/templates/self.conf.erb b/modules/puppet/templates/self.conf.erb index d293cb3..878b99d 100644 --- a/modules/puppet/templates/self.conf.erb +++ b/modules/puppet/templates/self.conf.erb @@ -27,7 +27,6 @@ <% if is_puppetmaster -%> [master] bindaddress = <%= bindaddress %> -ca_md = sha1 certname = <%= certname %> thin_storeconfigs = true templatedir = /etc/puppet/templates diff --git a/modules/puppetmaster/templates/master.conf.erb b/modules/puppetmaster/templates/master.conf.erb index fe17a16..77a9c88 100644 --- a/modules/puppetmaster/templates/master.conf.erb +++ b/modules/puppetmaster/templates/master.conf.erb @@ -1,6 +1,5 @@ [master] -ca_md = sha1 certname = <%= scope.lookupvar('puppetmaster::server_name') %> templatedir = /etc/puppet/templates modulepath = /etc/puppet/private/modules:/etc/puppet/modules -- To view, visit https://gerrit.wikimedia.org/r/219600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If95dfce645d9ab0bf28adb4fea946995623e69fe Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gage <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> Gerrit-Reviewer: Faidon Liambotis <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Mark Bergsma <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
