opendev
/
puppet-jenkins
Code Issues Proposed changes

Merge "Remove unused GnuPG keyring"

This commit is contained in:
Jenkins 2016-07-01 13:42:17 +00:00 committed by Gerrit Code Review
parent 868a8ec5c5 fbed50c66f
commit 06471dfde0
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
files/pubring.gpg
View File

Binary file not shown.

17
manifests/jenkinsuser.pp
View File

@ -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',

1
spec/acceptance/slave_spec.rb
View File

@ -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'),
]