diff --git a/Berksfile.lock b/Berksfile.lock index 879652204b..dee0de55bc 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -1,7 +1,5 @@ DEPENDENCIES apt - create_chef_dir - path: test/fixtures/cookbooks/create_chef_dir rundeck path: . metadata: true @@ -11,20 +9,24 @@ GRAPH iptables (>= 0.0.0) logrotate (>= 0.0.0) pacman (>= 0.0.0) - apt (2.4.0) + apt (2.5.3) build-essential (2.0.6) - create_chef_dir (0.0.1) - iptables (0.13.2) - java (1.26.0) + iptables (0.14.0) + java (1.28.0) logrotate (1.6.0) pacman (1.1.1) rundeck (2.0.5) apache2 (>= 0.0.0) java (>= 0.0.0) runit (>= 0.0.0) + selinux (>= 0.0.0) sudo (>= 0.0.0) - runit (1.5.11) + runit (1.5.10) build-essential (>= 0.0.0) - yum (>= 0.0.0) + yum (~> 3.0) + yum-epel (>= 0.0.0) + selinux (0.8.0) sudo (2.7.0) - yum (3.2.2) + yum (3.3.1) + yum-epel (0.5.1) + yum (~> 3.0) diff --git a/README.md b/README.md index 238e81ab44..88946c3979 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ This cookbook relies on multiple data bags. See __Data Bag__ below. * Mac OS X (managed node) **Notes**: This cookbook has been tested on the listed platforms. It may work on other platforms with or without modification. - +In RHEL / CentOS , SELinux is enabled by default, it blocks the apache mod_proxy , disable or add an exception selinux ### Cookbooks * Java diff --git a/recipes/server.rb b/recipes/server.rb index d5e38d0f4c..6231c3eb7f 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -40,12 +40,11 @@ repo = yum_repository "rundeck" do description "Rundeck - Release" url "http://dl.bintray.com/rundeck/rundeck-rpm" + gpgcheck false action :add end package "rundeck" do - #version "" - #options package_options action :install end else @@ -198,14 +197,13 @@ EOH end - -apache_site "000-default" do - enable false - notifies :reload, "service[apache2]" +%w(default 000-default).each do |site| + apache_site site do + enable false + notifies :reload, "service[apache2]" + end end - -# load up the apache conf template "apache-config" do path "#{node['apache']['dir']}/sites-available/rundeck.conf" source "rundeck.conf.erb" @@ -220,17 +218,15 @@ notifies :reload, "service[apache2]" end -apache_site "rundeck.conf" do +apache_site "rundeck" do + enable true notifies :reload, "service[apache2]" end -# ensure rundeck is started service "rundeckd" do action :start end - -#load projects bags = data_bag(node['rundeck']['rundeck_projects_databag']) projects = {}