From 2ba9ef9b273ad87b540b8c4988034fa18d6085a6 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 4 Jan 2013 14:14:23 -0500 Subject: [PATCH] Updates jenkinsuser so skel config is Ubuntu only. Exclude a couple of file resources from running on non-Ubuntu distributions (Red Hat for example) which don't always have bash config files (.bashrc, .profile, etc) in /etc/skel. Change-Id: Id67b16e1a80617c3bc98fce130b5fe2f343f5d6e Reviewed-on: https://review.openstack.org/18998 Reviewed-by: Clark Boylan Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Approved: James E. Blair Tested-by: Jenkins --- modules/jenkins/manifests/jenkinsuser.pp | 57 +++++++++++++----------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/modules/jenkins/manifests/jenkinsuser.pp b/modules/jenkins/manifests/jenkinsuser.pp index fd7dfc9c77..424ac9b432 100644 --- a/modules/jenkins/manifests/jenkinsuser.pp +++ b/modules/jenkins/manifests/jenkinsuser.pp @@ -82,34 +82,39 @@ class jenkins::jenkinsuser( require => File['/home/jenkins/.ssh'], } - file { '/home/jenkins/.bashrc': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0640', - source => '/etc/skel/.bashrc', - replace => false, - require => File['/home/jenkins'], - } + #NOTE: not all distributions have default bash files in /etc/skel + if ($::operatingsystem == 'Ubuntu') { - file { '/home/jenkins/.bash_logout': - ensure => present, - source => '/etc/skel/.bash_logout', - owner => 'jenkins', - group => 'jenkins', - mode => '0640', - replace => false, - require => File['/home/jenkins'], - } + file { '/home/jenkins/.bashrc': + ensure => present, + owner => 'jenkins', + group => 'jenkins', + mode => '0640', + source => '/etc/skel/.bashrc', + replace => false, + require => File['/home/jenkins'], + } + + file { '/home/jenkins/.bash_logout': + ensure => present, + source => '/etc/skel/.bash_logout', + owner => 'jenkins', + group => 'jenkins', + mode => '0640', + replace => false, + require => File['/home/jenkins'], + } + + file { '/home/jenkins/.profile': + ensure => present, + source => '/etc/skel/.profile', + owner => 'jenkins', + group => 'jenkins', + mode => '0640', + replace => false, + require => File['/home/jenkins'], + } - file { '/home/jenkins/.profile': - ensure => present, - source => '/etc/skel/.profile', - owner => 'jenkins', - group => 'jenkins', - mode => '0640', - replace => false, - require => File['/home/jenkins'], } file { '/home/jenkins/.ssh/config':