Add user.signingkey to .gitconfig

In an effort to support having an OpenPGP signing key that doesn't
exactly match the name+email in .gitconfig, separately parameterize
the signingkey option allowing it to be explicitly overridden with a
key ID or other similar identifier (such as a matching E-mail
address).

Change-Id: Id577c4479abd2f443f73c630a12e94d3ebe63660
This commit is contained in:
Jeremy Stanley 2016-07-29 18:39:33 +00:00
parent b489487781
commit a2a3faf8a7
3 changed files with 4 additions and 0 deletions

View File

@ -5,6 +5,7 @@ class jenkins::jenkinsuser(
$ensure = present, $ensure = present,
$gitfullname = 'OpenStack Jenkins', $gitfullname = 'OpenStack Jenkins',
$gitemail = 'jenkins@openstack.org', $gitemail = 'jenkins@openstack.org',
$gitpgpkey = 'jenkins@openstack.org',
$gerrituser = 'jenkins', $gerrituser = 'jenkins',
$gerritkeytype = 'rsa', $gerritkeytype = 'rsa',
$gerritkey = undef, $gerritkey = undef,

View File

@ -5,6 +5,7 @@ class jenkins::slave(
$user = true, $user = true,
$gitfullname = 'OpenStack Jenkins', $gitfullname = 'OpenStack Jenkins',
$gitemail = 'jenkins@openstack.org', $gitemail = 'jenkins@openstack.org',
$gitpgpkey = 'jenkins@openstack.org',
$gerrituser = 'jenkins', $gerrituser = 'jenkins',
$gerritkeytype = 'rsa', $gerritkeytype = 'rsa',
$gerritkey = undef, $gerritkey = undef,
@ -20,6 +21,7 @@ class jenkins::slave(
ssh_key => $ssh_key, ssh_key => $ssh_key,
gitfullname => $gitfullname, gitfullname => $gitfullname,
gitemail => $gitemail, gitemail => $gitemail,
gitpgpkey => $gitpgpkey,
gerrituser => $gerrituser, gerrituser => $gerrituser,
gerritkeytype => $gerritkeytype, gerritkeytype => $gerritkeytype,
gerritkey => $gerritkey, gerritkey => $gerritkey,

View File

@ -1,6 +1,7 @@
[user] [user]
name = <%= scope.lookupvar('jenkins::jenkinsuser::gitfullname') %> name = <%= scope.lookupvar('jenkins::jenkinsuser::gitfullname') %>
email = <%= scope.lookupvar('jenkins::jenkinsuser::gitemail') %> email = <%= scope.lookupvar('jenkins::jenkinsuser::gitemail') %>
signingkey = <%= scope.lookupvar('jenkins::jenkinsuser::gitpgpkey') %>
[gitreview] [gitreview]
rebase = false rebase = false
username = <%= scope.lookupvar('jenkins::jenkinsuser::gerrituser') %> username = <%= scope.lookupvar('jenkins::jenkinsuser::gerrituser') %>