[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Enable manage_home in scap

2017-08-02 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369560 )

Change subject: Gerrit: Enable manage_home in scap
..


Gerrit: Enable manage_home in scap

Needed for the ssh key to be added to the user

Change-Id: Iaf773c1329cf2945e8530ac24a738d412d7be773
---
M modules/gerrit/manifests/jetty.pp
1 file changed, 8 insertions(+), 1 deletion(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 55dbac3..294457c 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -24,7 +24,7 @@
 shell  => '/bin/bash',
 home   => '/var/lib/gerrit2',
 system => true,
-managehome => false,
+managehome => true,
 }
 
 include ::nrpe
@@ -129,6 +129,13 @@
 show_diff => false,
 }
 
+ssh::userkey { 'gerrit2-scap':
+ensure  => present,
+user=> 'gerrit2',
+skey=> 'gerrit-scap',
+content => secret('keyholder/gerrit.pub'),
+}
+
 ssh::userkey { 'gerrit2-cluster-sync':
 ensure => present,
 user   => 'gerrit2',

-- 
To view, visit https://gerrit.wikimedia.org/r/369560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf773c1329cf2945e8530ac24a738d412d7be773
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Enable manage_home in scap

2017-08-01 Thread Paladox (Code Review)
Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369560 )

Change subject: Gerrit: Enable manage_home in scap
..

Gerrit: Enable manage_home in scap

Needed for the ssh key to be added to the user

Change-Id: Iaf773c1329cf2945e8530ac24a738d412d7be773
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/369560/1


-- 
To view, visit https://gerrit.wikimedia.org/r/369560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf773c1329cf2945e8530ac24a738d412d7be773
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits