X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/00f120fc8272cb0780cafb778901de96190ad17e..cec717b818ba058b4e968fe83b4b4b8e20d87b83:/cookbooks/chef/recipes/server.rb

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 51df04baa..e76e074ea 100644
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -20,11 +20,12 @@
 include_recipe "apache::ssl"
 
 chef_platform = case node[:platform_version]
-                  when "12.10" then "12.04"
-                  else node[:platform_version]
+                when "12.10" then "12.04"
+                when "14.04" then "12.04"
+                else node[:platform_version]
                 end
 
-chef_package = "chef-server_#{node[:chef][:server][:version]}.ubuntu.#{chef_platform}_amd64.deb"
+chef_package = "chef-server_#{node[:chef][:server][:version]}_amd64.deb"
 
 directory "/var/cache/chef" do
   owner "root"
@@ -33,11 +34,11 @@ directory "/var/cache/chef" do
 end
 
 Dir.glob("/var/cache/chef/chef-server_*.deb").each do |deb|
-  if deb != "/var/cache/chef/#{chef_package}"
-    file deb do
-      action :delete
-      backup false
-    end
+  next if deb == "/var/cache/chef/#{chef_package}"
+
+  file deb do
+    action :delete
+    backup false
   end
 end
 
@@ -84,7 +85,7 @@ end
 
 service "chef-server-runsvdir" do
   provider Chef::Provider::Service::Upstart
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
@@ -101,3 +102,10 @@ template "/etc/cron.daily/chef-server-backup" do
   group "root"
   mode 0755
 end
+
+template "/etc/logrotate.d/chef-server" do
+  source "logrotate.server.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end