Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/257275
Change subject: [WIP] base: Use the standard location for puppet ca
......................................................................
[WIP] base: Use the standard location for puppet ca
- Puppet client certs should *always* be in /var/lib/puppet/ssl
to simplify lives
- This isn't true yet, so do not merge until it is true
Change-Id: Iae550ebc0c1b4cf40ed8153bf94378a0fd2e81f5
---
M modules/base/manifests/certificates.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/257275/1
diff --git a/modules/base/manifests/certificates.pp
b/modules/base/manifests/certificates.pp
index 74a694b..b11a5d3 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -20,10 +20,8 @@
source =>
'puppet:///modules/base/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt',
}
- $puppet_ssl_dir = puppet_ssldir()
-
sslcert::ca { 'Puppet_Internal_CA':
- source => "${puppet_ssl_dir}/certs/ca.pem"
+ source => "/var/lib/puppet/ssl/certs/ca.pem"
}
# install all CAs before generating certificates
--
To view, visit https://gerrit.wikimedia.org/r/257275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae550ebc0c1b4cf40ed8153bf94378a0fd2e81f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
