diff --git a/metadata.rb b/metadata.rb index 279e65d637..377975c578 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' description 'Installs and configures Rundeck 2.x' -long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) + version '5.0.2' depends 'java' depends 'apache2', '~> 7.0.0' diff --git a/resources/apache.rb b/resources/apache.rb index ffdd51a279..a41d2b1627 100644 --- a/resources/apache.rb +++ b/resources/apache.rb @@ -52,7 +52,7 @@ # until added to Apache2 package 'mod_ssl' do action :install - only_if { node['platform_family'] == 'rhel' } + only_if { platform_family?('rhel') } end apache2_module 'ssl' @@ -110,8 +110,8 @@ owner 'root' group 'root' variables( - log_dir: node['platform_family'] == 'rhel' ? '/var/log/httpd' : '/var/log/apache2', - doc_root: node['platform_family'] == 'rhel' ? '/var/www/html' : '/var/www', + log_dir: platform_family?('rhel') ? '/var/log/httpd' : '/var/log/apache2', + doc_root: platform_family?('rhel') ? '/var/www/html' : '/var/www', use_ssl: new_resource.use_ssl, hostname: new_resource.hostname, email: new_resource.email, diff --git a/resources/server_install.rb b/resources/server_install.rb index 506969a1a4..e9bdef8c18 100644 --- a/resources/server_install.rb +++ b/resources/server_install.rb @@ -236,7 +236,7 @@ configdir: new_resource.configdir ) notifies (new_resource.restart_on_config_change ? :restart : :nothing), 'service[rundeckd]', :delayed - only_if { node['platform_family'] == 'debian' } + only_if { platform_family?('debian') } end template "#{new_resource.configdir}/framework.properties" do diff --git a/test/cookbooks/test/metadata.rb b/test/cookbooks/test/metadata.rb index e47f7c90ce..a37ec2f3ff 100644 --- a/test/cookbooks/test/metadata.rb +++ b/test/cookbooks/test/metadata.rb @@ -2,7 +2,7 @@ name 'test' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' -license 'Apache 2.0' +license 'Apache-2.0' description 'Installs/Configures test' version '0.1.0'