Volans has uploaded a new change for review. https://gerrit.wikimedia.org/r/282380
Change subject: Allow a third value to use the Puppet certs ...................................................................... Allow a third value to use the Puppet certs With this third value for the ssl variable ('puppet-certs') in the templates we can choose which certificate to use. Bug: T111654 Change-Id: I3036a612b738225e8844fe15deb683ff2478526c --- M manifests/config.pp 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/mariadb refs/changes/80/282380/1 diff --git a/manifests/config.pp b/manifests/config.pp index 9c829d7..f2e3f0b 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -83,7 +83,7 @@ source => 'puppet:///files/icinga/check_mariadb.pl', } - if ($ssl == 'on' or $ssl == 'multiple-ca') { + if ($ssl == 'on' or $ssl == 'multiple-ca' or $ssl == 'puppet-cert') { # This creates also /etc/mysql/ssl ::base::expose_puppet_certs { '/etc/mysql': @@ -91,6 +91,7 @@ provide_private => true, user => 'mysql', group => 'mysql', + require => File['/etc/ssl/certs/Puppet_Internal_CA.pem'], } file { '/etc/mysql/ssl/cacert.pem': -- To view, visit https://gerrit.wikimedia.org/r/282380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3036a612b738225e8844fe15deb683ff2478526c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/mariadb Gerrit-Branch: master Gerrit-Owner: Volans <rcocci...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits