Skip to content

Commit

Permalink
Fix #540 (#576)
Browse files Browse the repository at this point in the history
Signed-off-by: Seth Thomas <sthomas@chef.io>
  • Loading branch information
Seth Thomas committed Mar 8, 2017
1 parent 6d961cb commit 76a982c
Showing 1 changed file with 18 additions and 21 deletions.
39 changes: 18 additions & 21 deletions recipes/_master_package.rb
Expand Up @@ -37,35 +37,32 @@
dpkg_autostart 'jenkins' do
allow false
end

package 'jenkins' do
version node['jenkins']['master']['version']
end

template '/etc/default/jenkins' do
source 'jenkins-config-debian.erb'
mode '0644'
notifies :restart, 'service[jenkins]', :immediately
end
when 'rhel'
yum_repository 'jenkins-ci' do
baseurl node['jenkins']['master']['repository']
gpgkey node['jenkins']['master']['repository_key']
end
end

package 'jenkins' do
version node['jenkins']['master']['version']
end
package 'jenkins' do
version node['jenkins']['master']['version']
end

# The package install creates the Jenkins user so now is the time to set the home
# directory permissions.
directory node['jenkins']['master']['home'] do
owner node['jenkins']['master']['user']
group node['jenkins']['master']['group']
mode '0755'
recursive true
end
directory node['jenkins']['master']['home'] do
owner node['jenkins']['master']['user']
group node['jenkins']['master']['group']
mode '0755'
recursive true
end

case node['platform_family']
when 'debian'
template '/etc/default/jenkins' do
source 'jenkins-config-debian.erb'
mode '0644'
notifies :restart, 'service[jenkins]', :immediately
end
when 'rhel'
template '/etc/sysconfig/jenkins' do
source 'jenkins-config-rhel.erb'
mode '0644'
Expand Down

0 comments on commit 76a982c

Please sign in to comment.