From 55535a8464eff6f81c49d41e1adaa588b93ee995 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Wed, 14 Nov 2012 22:33:51 -0500 Subject: [PATCH] Added custom url attribute --- attributes/default.rb | 2 ++ recipes/default.rb | 23 ++++------------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index a96e84d..f34862b 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,5 +1,7 @@ default['minecraft']['user'] = 'minecraft' default['minecraft']['install_dir'] = '/srv/minecraft' +default['minecraft']['base_url'] = 'https://s3.amazonaws.com/MinecraftDownload/launcher' +default['minecraft']['jar'] = 'minecraft_server.jar' default['minecraft']['banned-ips'] = [] default['minecraft']['banned-players'] = [] diff --git a/recipes/default.rb b/recipes/default.rb index a3acb7a..0797746 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -28,22 +28,7 @@ include_recipe 'java::default' -minecraft_downloads = { :linux => "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft_server.jar" } - -tmpdir = Chef::Config[:file_cache_path] -minecraft_jar = "#{tmpdir}/minecraft_server.jar" -minecraft_platform = case node['os'] - when "linux" - :linux - else - puts "Only supports linux right now, patches welcome." -end - -if node['minecraft']['source'] - minecraft_source = node['minecraft']['source'] -else - minecraft_source = minecraft_downloads[minecraft_platform] -end +minecraft_jar = "#{Chef::Config['file_cache_path']}/#{node['minecraft']['jar']}" user node['minecraft']['user'] do system true @@ -53,11 +38,11 @@ end remote_file minecraft_jar do - source minecraft_source + source "#{node['minecraft']['base_url']}/#{node['minecraft']['jar']}" owner node['minecraft']['user'] group node['minecraft']['user'] - mode "0644" - backup 5 + mode '0644' + not_if { File.exists?(minecraft_jar) } end directory node['minecraft']['install_dir'] do