Herron has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404587 )
Change subject: puppetmaster::ssl: fix crl file suffix
......................................................................
puppetmaster::ssl: fix crl file suffix
change file suffix from .0 to .r0 for crl symlinks
created by puppetmaster::ssl
Bug: T184444
Change-Id: Iaac76a740a851bb2bc06c81ef53ef520bf285393
---
M modules/puppetmaster/manifests/ssl.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Herron: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/ssl.pp
b/modules/puppetmaster/manifests/ssl.pp
index f93e61d..8509fc6 100644
--- a/modules/puppetmaster/manifests/ssl.pp
+++ b/modules/puppetmaster/manifests/ssl.pp
@@ -38,7 +38,7 @@
exec { 'setup crl dir':
require => File["${ssldir}/crl"],
path => '/usr/sbin:/usr/bin:/sbin:/bin',
- command => "ln -s ${ssldir}/ca/ca_crl.pem ${ssldir}/crl/$(openssl crl
-in ${ssldir}/ca/ca_crl.pem -hash -noout).0",
- onlyif => "test ! -L ${ssldir}/crl/$(openssl crl -in
${ssldir}/ca/ca_crl.pem -hash -noout).0",
+ command => "ln -s ${ssldir}/ca/ca_crl.pem ${ssldir}/crl/$(openssl crl
-in ${ssldir}/ca/ca_crl.pem -hash -noout).r0",
+ onlyif => "test ! -L ${ssldir}/crl/$(openssl crl -in
${ssldir}/ca/ca_crl.pem -hash -noout).r0",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/404587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaac76a740a851bb2bc06c81ef53ef520bf285393
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron <kher...@wikimedia.org>
Gerrit-Reviewer: Herron <kher...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
