Ori.livneh has submitted this change and it was merged.
Change subject: keyholder: provision /run/keyholder
......................................................................
keyholder: provision /run/keyholder
Change-Id: I626d262cf99bae5774b3c889ba3b6e4667688916
---
M modules/keyholder/manifests/init.pp
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/keyholder/manifests/init.pp
b/modules/keyholder/manifests/init.pp
index f19c4f5..0ada32a 100644
--- a/modules/keyholder/manifests/init.pp
+++ b/modules/keyholder/manifests/init.pp
@@ -59,6 +59,13 @@
managehome => false,
}
+ file { '/run/keyholder':
+ ensure => directory,
+ owner => 'keyholder',
+ group => 'keyholder',
+ mode => '0755',
+ }
+
file { '/usr/local/bin/ssh-agent-proxy':
source => 'puppet:///modules/keyholder/ssh-agent-proxy',
owner => 'root',
@@ -82,7 +89,7 @@
service { 'keyholder-agent':
ensure => running,
provider => 'upstart',
- require => User['keyholder'],
+ require => File['/run/keyholder'],
}
--
To view, visit https://gerrit.wikimedia.org/r/172815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I626d262cf99bae5774b3c889ba3b6e4667688916
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
