Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351571 )
Change subject: keyholder: fix provisioning on trusty
......................................................................
keyholder: fix provisioning on trusty
tmpfiles.d is a jessie feature. The directory maintenance this performs
is not strictly necessary as a File resource also exists in the same
manifest to provision /run/keyholder.
Change-Id: I8e116afba71f4f3fb287d46483de883a56a39520
---
M modules/keyholder/manifests/init.pp
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/keyholder/manifests/init.pp
b/modules/keyholder/manifests/init.pp
index c7abe37..26554c9 100644
--- a/modules/keyholder/manifests/init.pp
+++ b/modules/keyholder/manifests/init.pp
@@ -49,13 +49,15 @@
mode => '0755',
}
- file { '/etc/tmpfiles.d/keyholder.conf':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0444',
- content => 'd /run/keyholder 0755 keyholder keyholder',
- require => User['keyholder'],
+ if os_version('debian >= jessie') {
+ file { '/etc/tmpfiles.d/keyholder.conf':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => 'd /run/keyholder 0755 keyholder keyholder',
+ require => User['keyholder'],
+ }
}
file { '/etc/keyholder.d':
--
To view, visit https://gerrit.wikimedia.org/r/351571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e116afba71f4f3fb287d46483de883a56a39520
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
