Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve ruby code on if/unless clauses #59

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve ruby code on if/unless clauses #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions recipes/publish.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,26 @@

include_recipe 'aem::_base_aem_setup'

unless node[:aem][:use_yum]
aem_jar_installer 'publish' do
download_url node[:aem][:download_url]
default_context node[:aem][:publish][:default_context]
port node[:aem][:publish][:port]
action :install
end
aem_jar_installer 'publish' do
download_url node[:aem][:download_url]
default_context node[:aem][:publish][:default_context]
port node[:aem][:publish][:port]
action :install
not_if { node[:aem][:use_yum] }
end

unless node[:aem][:license_url].nil?
remote_file "#{node[:aem][:publish][:default_context]}/license.properties" do
source "#{node[:aem][:license_url]}"
sensitive true
mode 0644
end
remote_file "#{node[:aem][:publish][:default_context]}/license.properties" do
source "#{node[:aem][:license_url]}"
sensitive true
mode 0644
only_if { node[:aem][:license_url] }
end

unless node[:aem][:license_customer_name].nil? && node[:aem][:license_download_id].nil?
template "#{node[:aem][:publish][:default_context]}/license.properties" do
source 'license.properties.erb'
sensitive true
mode 0644
end
template "#{node[:aem][:publish][:default_context]}/license.properties" do
source 'license.properties.erb'
sensitive true
mode 0644
only_if { node[:aem][:license_customer_name] && node[:aem][:license_download_id] }
end

if node[:aem][:version].to_f > 5.4
Expand Down Expand Up @@ -83,7 +80,7 @@
end
end

unless node[:aem][:publish][:new_admin_password].nil?
if node[:aem][:publish][:new_admin_password]
# Change admin password
aem_user node[:aem][:publish][:admin_user] do
password node[:aem][:publish][:new_admin_password]
Expand Down