From fbed50c66f12ff80268fe2586875c635cbebb07f Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 23 Jun 2016 18:11:51 +0000 Subject: [PATCH] Remove unused GnuPG keyring This was added by commit de7975c--Gerrit change 7--so old it predates Change-Id headers in the repo (and, apparently, commit messages). Today it seems to be completely unused. The pubring.gpg contained just this one key: pub 2048R/32EE128C 2010-08-15 uid OpenStack Hudson sub 2048R/92E212FC 2010-08-15 Based on discussion in IRC, Monty vaguely recalls this might have been related to DEB package building once upon a time (something we no longer do and wouldn't configure from this module anyway when eventually want to start doing again). Change-Id: I70c3b82185681ee64791cda653360c26a93bd466 --- files/pubring.gpg | Bin 1198 -> 0 bytes manifests/jenkinsuser.pp | 17 ----------------- spec/acceptance/slave_spec.rb | 1 - 3 files changed, 18 deletions(-) delete mode 100644 files/pubring.gpg diff --git a/files/pubring.gpg b/files/pubring.gpg deleted file mode 100644 index 3259346ed6942a550c5eb45448b96799d2d6417b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1198 zcmV;f1X25$0SyF9Xb@`w2mr`60*An;w86gZ_(&e|n1+eL7JbOAj%(=AfczhZOWs)l z_CsmhR*H{+akC0n#P}jKIW=1H*9VqKsB)n!m{d&f3dOclK>c>}_r9cGvas=#QBTeL z0OpR-D|+_1NCyWT6i~p0Ai$GE!s^X4TKJ1w14h@+Q$(e++He+J=zTyG8eml{1HryS z?YJ0~LeF{SX#yyYTAsKQhLe}%J%b@e4IRoaZI6gcj|3evoMmQ%gi7_QMX%95h(bwT z6c6QEtm7Pf_?;S2;hI#e8q0^jzqsUa|7 zY^jW|hSPE4&Grew3Jk_rI|MN@0n?H*FdsI+onvh~_dY5xak!k3c;rz}(5f`r{Fv(Y z(tRF?&g3;pVtD~ZB6NxBFXgiCChYgrjtnDDh;%V#pp(=th{A{V_p)n+yi!0b0hB{@ zdLYk?>RXx{2U$_D0ssTK0SyF9Xb@`w2mrJSFJd)#Nd0OVDSw6SgcSPq8v6MU?=P-d z3yhl6r{A$&E#SC7Vhz4h^Htq9)L}6#Tges0h=~io@k$uH-N2`BlXR-m8h|CEMJ zpb0fIcoyYA>HH?2qA`<1s((Qlg*M7rS5EGl?_X@Fry?!n0g1vkUR3<`!ysU{4R0Ll zvP?cLV#`Hq=vLzVV~xphQmd=z0osXWBJ1U;1nlirjM<^sRhx6*T zc0Yg0j(+10W5D_}uBO8EU3?VEY=n2wwmZ0RRDs0Urby0RjLC1p-WH5NiS(3;+rV5Z{GR z5;E=*j3*KZ0LHlLQta(@hG7#HnA^s&%k{O z3J*FR(tox4uEjOnR;zUT$!qw0ECr<+>Rms-(djpOtc@hC3H68jghfug{4<^ILti9H z3XPASerdOhp;2boePV*0t&X;FK5XxxBX^XM9&b1<|Mxdv>H}+A_RpTiD|Reiy7;Z= z4y4tOELE#Gt^R4#TWkwnRXY@Gu!5p`x68dTPGW^7wzNd^!7K~30Bi3B3aWyAI_jRc zb<4k!tGuy>s2iNVC$w{-25w?lbRqm{cFV@geQwPoSat~!hm@J^U`6MYs(CKDGUl!q Mi-Mfv&9DLh1OEvo#Q*>R diff --git a/manifests/jenkinsuser.pp b/manifests/jenkinsuser.pp index f557df2..dfc70cf 100644 --- a/manifests/jenkinsuser.pp +++ b/manifests/jenkinsuser.pp @@ -109,23 +109,6 @@ class jenkins::jenkinsuser( source => 'puppet:///modules/jenkins/ssh_config', } - file { '/home/jenkins/.gnupg': - ensure => directory, - owner => 'jenkins', - group => 'jenkins', - mode => '0700', - require => File['/home/jenkins'], - } - - file { '/home/jenkins/.gnupg/pubring.gpg': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - require => File['/home/jenkins/.gnupg'], - source => 'puppet:///modules/jenkins/pubring.gpg', - } - file { '/home/jenkins/.config': ensure => directory, owner => 'jenkins', diff --git a/spec/acceptance/slave_spec.rb b/spec/acceptance/slave_spec.rb index 49e1edf..5e8d17f 100644 --- a/spec/acceptance/slave_spec.rb +++ b/spec/acceptance/slave_spec.rb @@ -65,7 +65,6 @@ describe 'puppet-jenkins slave module', :if => ['debian', 'ubuntu'].include?(os[ jenkins_user_files = [ file('/home/jenkins/.bash_logout'), file('/home/jenkins/.bashrc'), - file('/home/jenkins/.gnupg/pubring.gpg'), file('/home/jenkins/.profile'), file('/home/jenkins/.ssh/authorized_keys'), ]