Skip to content

Commit

Permalink
Fixes #70
Browse files Browse the repository at this point in the history
  • Loading branch information
PowerSchill committed Oct 13, 2019
1 parent e7d3927 commit 544f0cb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email '[email protected]'
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'
Expand Down
6 changes: 3 additions & 3 deletions resources/apache.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion resources/server_install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/cookbooks/test/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name 'test'
maintainer 'Sous Chefs'
maintainer_email '[email protected]'
license 'Apache 2.0'
license 'Apache-2.0'
description 'Installs/Configures test'
version '0.1.0'

Expand Down

0 comments on commit 544f0cb

Please sign in to comment.